From 0c0beba3f43f4d17675851dda8e2f94ca5a2b11b Mon Sep 17 00:00:00 2001
From: ramanathan <ramerama@tataelxsi.co.in>
Date: Wed, 17 Mar 2021 12:21:33 +0530
Subject: [PATCH 1/2] Trial

---
 src/yang/etsi-nfv-ns.yang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index f9ea24b..e5dd535 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -214,6 +214,7 @@ submodule etsi-nfv-ns {
         }
 
         choice associated-cpd-id {
+
           container vnf {
             leaf vnfd-id {
               mandatory true;
-- 
GitLab


From cf2345825a5d2c32edb2b1da1faf8fb1df232f3a Mon Sep 17 00:00:00 2001
From: ramanathan <ramerama@tataelxsi.co.in>
Date: Wed, 24 Mar 2021 14:08:59 +0100
Subject: [PATCH 2/2] Issue #35 IFA014ed341 fix Sapd attribute associatedCpd

---
 src/yang/etsi-nfv-ns.yang | 53 +++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index e5dd535..889538a 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -213,9 +213,8 @@ submodule etsi-nfv-ns {
             "GS NFV IFA014: Section 6.2.3.2 Sapd information element";
         }
 
-        choice associated-cpd-id {
-
-          container vnf {
+        container associated-cpd {
+          choice constituent-base-element-id {
             leaf vnfd-id {
               mandatory true;
               type leafref {
@@ -223,16 +222,6 @@ submodule etsi-nfv-ns {
               }
               must "boolean(../../../vnfd-id[.=current()])";
             }
-
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
-              }
-            }
-          }
-
-          container pnf {
             leaf pnfd-id {
               mandatory true;
               type leafref {
@@ -240,30 +229,50 @@ submodule etsi-nfv-ns {
               }
               must "boolean(../pnfd-id[.=current()])";
             }
-
-            leaf ext-cpd-id {
+            leaf nsd-id {
               mandatory true;
               type leafref {
-                path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
+                path "../../../../nsd/id";
               }
+              must "boolean(../nsd-id[.=current()])";
             }
+            description
+              "References the profile of an NS constituent.";
+            reference
+              "GS NFV IFA014: Section 6.4.8 CpdInConstituentElement information element";
           }
-          container ns {
-            leaf nsd-id {
+          choice constituent-cpd-id {  
+            leaf vnf-ext-cpd  {
               mandatory true;
               type leafref {
-                path "../../../../nsd/id";
+                path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
               }
-              must "boolean(../nsd-id[.=current()])";
             }
-
-            leaf ext-cpd-id {
+            leaf pnf-ext-cpd  {
+              mandatory true;
+              type leafref {
+                path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
+              }
+            }
+            leaf sapd {
               mandatory true;
               type leafref {
                 path "deref(../nsd-id)/../sapd/id";
               }
             }
+            description
+              "References the VNF external CPD for a given VnfProfile, or the PNF 
+               external CPD for a given PnfProfile, or an NS SAPD for a given NsProfile
+               identified by the constituentBaseElementId.";
+            reference
+              "GS NFV IFA014: Section 6.4.8 CpdInConstituentElement information element";
           }
+          description
+              "Describes a CPD or SAPD in the context of an NS constituent element, which
+               the SAPs instantiated from this SAPD are mapped to.";
+          reference
+              "GS NFV IFA014: Section 6.2.3	Sapd information element";
+            
         }
       }
     }
-- 
GitLab