patch/deref_warnings.patch

   1 #
   2 # Copyright 2019 Whitestack LLC
   3 #
   4 # Licensed under the Apache License, Version 2.0 (the "License");
   5 # you may not use this file except in compliance with the License.
   6 # You may obtain a copy of the License at
   7 #
   8 #    http://www.apache.org/licenses/LICENSE-2.0
   9 #
  10 # Unless required by applicable law or agreed to in writing, software
  11 # distributed under the License is distributed on an "AS IS" BASIS,
  12 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  13 # implied.
  14 # See the License for the specific language governing permissions and
  15 # limitations under the License.
  16
  17 --- /tmp/sol006_model/src/yang/etsi-nfv-ns.yang 2019-12-04 13:56:05.510072421 +0000
  18 +++ /tmp/sol006_model/src/yang/etsi-nfv-ns_new.yang     2019-12-04 13:59:32.675856579 +0000
  19 @@ -434,8 +434,8 @@
  20            mandatory "true";
  21            container vnf-profile {
  22              leaf vnf-profile-id {
  23 -              must ". = deref(../../vnfd-profile-id)" {
  24 -              }
  25 +              // must ". = deref(../../vnfd-profile-id)" {
  26 +              // }
  27                type leafref {
  28                  path "../../../../../nsd/df/vnf-profile/id";
  29                }
  30 @@ -443,8 +443,8 @@
  31            }
  32            container pnf-profile {
  33              leaf pnf-profile-id {
  34 -              must ". = deref(../../pnfd-profile-id)" {
  35 -              }
  36 +              // must ". = deref(../../pnfd-profile-id)" {
  37 +              // }
  38                type leafref {
  39                  path "../../../../../nsd/df/pnf-profile/id";
  40                }
  41 @@ -452,8 +452,8 @@
  42            }
  43            container ns-profile {
  44              leaf ns-profile-id {
  45 -              must ". = deref(../../ns-profile-id)" {
  46 -              }
  47 +              // must ". = deref(../../ns-profile-id)" {
  48 +              // }
  49                type leafref {
  50                  path "../../../../../nsd/df/ns-profile/id";
  51                }
  52 @@ -469,8 +469,8 @@
  53          choice constituent-cpd-id {
  54            container vnf {
  55              leaf vnfd-id {
  56 -              must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
  57 -              }
  58 +              // must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
  59 +              // }
  60                type leafref {
  61                  path "../../../../../vnfd/id";
  62                }
  63 @@ -483,8 +483,8 @@
  64            }
  65            container pnf {
  66              leaf pnfd-id {
  67 -              must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
  68 -              }
  69 +              // must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
  70 +              // }
  71                type leafref {
  72                  path "../../../../../pnfd/id";
  73                }
  74 @@ -497,9 +497,9 @@
  75            }
  76            container ns {
  77              leaf nsd-id {
  78 -              must ". = deref(../../nested-ns-profile-id)/" +
  79 -                   "../nsd-id" {
  80 -              }
  81 +              // must ". = deref(../../nested-ns-profile-id)/" +
  82 +              //      "../nsd-id" {
  83 +              // }
  84
  85                type leafref {
  86                  path "../../../../../nsd/id";