Addressing changes from NFVIFA(19)000513r2

src/yang/etsi-nfv-ns.yang

@@ -415,57 +415,7 @@ submodule etsi-nfv-ns {
            element";
       }
 
-      leaf-list nfp-position-element-id {
-        type leafref {
-          path "../nfpd/position-desc/element/id";
-        }
-        description
-          "References NfpPositionElement associated with one of the
-           constituent VNF Profile, PNF Profile or NS Profile of a
-           nested NS.";
-        reference
-          "GS NFV IFA014: Section 6.4.2.2 Vnffgd information
-           element";
-      }
-
-      list nfpd {
-        key "id";
-
-        leaf id {
-          type string;
-          description
-            "Identifies this nfpd information element within a
-             VNFFGD.";
-          reference
-            "GS NFV IFA014: Section 6.4.3.2 Nfpd information
-             element";
-        }
-
-        leaf rule {
-          type string;
-          description
-            "Provides an NFP classification and selection rule.
-             The rule may be expressed as a criteria constructed out
-             of atomic assertions linked by Boolean operators AND,
-             OR and NOT.";
-          reference
-            "GS NFV IFA014: Section 6.4.3.2 Nfpd information
-             element";
-        }
-
-        list position-desc {
-          key "id";
-
-          leaf id {
-            type string;
-            description
-              "Identifier of this NfpPositionDesc element.";
-            reference
-              "GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
-               information element";
-          }
-
-          list element {
+      list nfp-position-element {
         key "id";
 
         leaf id {
@@ -487,7 +437,7 @@ submodule etsi-nfv-ns {
                 must ". = deref(../../vnfd-profile-id)" {
                 }
                 type leafref {
-                      path "../../../../../../../../nsd/df/vnf-profile/id";
+                  path "../../../../../../nsd/df/vnf-profile/id";
                 }
               }
             }
@@ -496,7 +446,7 @@ submodule etsi-nfv-ns {
                 must ". = deref(../../pnfd-profile-id)" {
                 }
                 type leafref {
-                      path "../../../../../../../../nsd/df/pnf-profile/id";
+                  path "../../../../../../nsd/df/pnf-profile/id";
                 }
               }
             }
@@ -505,7 +455,7 @@ submodule etsi-nfv-ns {
                 must ". = deref(../../ns-profile-id)" {
                 }
                 type leafref {
-                      path "../../../../../../../../nsd/df/ns-profile/id";
+                  path "../../../../../../nsd/df/ns-profile/id";
                 }
               }
             }
@@ -522,7 +472,7 @@ submodule etsi-nfv-ns {
                 must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
                 }
                 type leafref {
-                      path "../../../../../../../../vnfd/id";
+                  path "../../../../../../vnfd/id";
                 }
               }
               leaf cpd-id {
@@ -536,7 +486,7 @@ submodule etsi-nfv-ns {
                 must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
                 }
                 type leafref {
-                      path "../../../../../../../../pnfd/id";
+                  path "../../../../../../pnfd/id";
                 }
               }
               leaf pnf-cpd-id {
@@ -552,7 +502,7 @@ submodule etsi-nfv-ns {
                 }
 
                 type leafref {
-                      path "../../../../../../../../nsd/id";
+                  path "../../../../../../nsd/id";
                 }
               }
               leaf sap-cpd-id {
@@ -586,6 +536,56 @@ submodule etsi-nfv-ns {
            information element";
       }
 
+      list nfpd {
+        key "id";
+
+        leaf id {
+          type string;
+          description
+            "Identifies this nfpd information element within a
+             VNFFGD.";
+          reference
+            "GS NFV IFA014: Section 6.4.3.2 Nfpd information
+             element";
+        }
+
+        leaf rule {
+          type string;
+          description
+            "Provides an NFP classification and selection rule.
+             The rule may be expressed as a criteria constructed out
+             of atomic assertions linked by Boolean operators AND,
+             OR and NOT.";
+          reference
+            "GS NFV IFA014: Section 6.4.3.2 Nfpd information
+             element";
+        }
+
+        list position-desc {
+          key "id";
+
+          leaf id {
+            type string;
+            description
+              "Identifier of this NfpPositionDesc element.";
+            reference
+              "GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
+               information element";
+          }
+
+          leaf-list nfp-position-element-id {
+            type leafref {
+              path "../../../nfp-position-element/id";
+            }
+            description
+              "References NfpPositionElement associated with one of the
+               constituent VNF Profile, PNF Profile or NS Profile of a
+               nested NS.";
+            reference
+              "GS NFV IFA014: Section 6.4.2.2 Vnffgd information
+               element";
+          }
+
           leaf forwarding-behaviour {
             type identityref {
               base forwarding-behaviour;