X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Faugments%2Fns-vld.yang;h=b85acbfe2a04bf91e5daca92cf1827a7fb9a4737;hp=e892d8a9d3e941dcf564e072968184cc5d37cc14;hb=HEAD;hpb=76f6a62b4cc15bc77cf1270d2b1630524fb2879f

diff --git a/models/augments/ns-vld.yang b/models/augments/ns-vld.yang
index e892d8a..ac3cc4c 100644
--- a/models/augments/ns-vld.yang
+++ b/models/augments/ns-vld.yang
@@ -24,6 +24,10 @@ module ns-vld {
         prefix nsd;
     }
 
+    import ietf-inet-types {
+        prefix inet;
+    }
+
     grouping extended-vld {
         container provider-network {
             description
@@ -48,10 +52,78 @@ module ns-vld {
             type boolean;
             default false;
         }
-    }
 
+        leaf vim-network-name {
+            description
+              "Name of network in VIM account. This is used to indicate
+               pre-provisioned network name in cloud account.";
+            type string;
+        }
+    }
 
     augment "/nsd:nsd/nsd:nsd/nsd:virtual-link-desc" {
         uses extended-vld;
     }
+
+    grouping deviated-constituent-cpd-id {
+        list constituent-cpd-id {
+           key "constituent-base-element-id constituent-cpd-id";
+
+           description
+             "Describes a connection point on a VNF/PNF or a SAP
+              which connects to virtual links instantiated from
+              the profile identified in the virtualLinkProfileId
+              attribute.";
+           reference
+             "GS NFV IFA014: Section 6.3.7
+              NsVirtualLinkConnectivity information element";
+
+           leaf constituent-base-element-id {
+               type leafref {
+                   path "../../../nsd:id";
+               }
+               description
+                 "Reference to the profile of an NS constituent.";
+               reference
+                 "GS NFV IFA014: Section 6.4.8
+                  CpdInConstituentElement information element";
+           }
+
+           leaf constituent-cpd-id {
+               type leafref {
+                   path "deref(../../../nsd:vnfd-id)/../nsd:ext-cpd/nsd:id";
+               }
+               description
+                 "A reference to the descriptor of a connection point
+                  attached to one of the constituent VNFs and PNFs or to
+                  the descriptor of a NS SAP.";
+               reference
+                 "GS NFV IFA014: Section 6.4.4.2 CpdPool information
+                  element";
+           }
+
+           leaf-list ip-address {
+               description
+                 "IP address list assigned to the internal connection point";
+                  type inet:ip-address;
+           }
+       }
+    }
+
+    deviation "/nsd:nsd/nsd:nsd/nsd:df/nsd:vnf-profile/nsd:virtual-link-connectivity/nsd:constituent-cpd-id" {
+        description
+          "Deviation of the list of constituent-cpd-id, because the key must be
+           a compound key 'constituent-base-element-id constituent-cpd-id'";
+        deviate not-supported;
+    }
+
+    augment "/nsd:nsd/nsd:nsd/nsd:df/nsd:vnf-profile/nsd:virtual-link-connectivity" {
+        description
+          "Augment of nsd:virtual-link-connectivity to define a list of constituent-cpd-id,
+           replacing the one in SOL006, with a compound key
+           'constituent-base-element-id constituent-cpd-id', and the
+           addition of the leaf ip-address for each item in the list.";
+        uses deviated-constituent-cpd-id;
+    }
+
 }