From a9be2b8ce3e1ee200b8415ded9e049e9dfd80dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Villaseca?= <tvvillas@gmail.com>
Date: Tue, 17 Dec 2019 16:46:49 -0300
Subject: [PATCH] Remove nested choice in SAPD

---
 src/yang/etsi-nfv-ns.yang | 72 +++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 1eb49ce..a44b669 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -159,54 +159,52 @@ submodule etsi-nfv-ns {
             "GS NFV IFA014: Section 6.2.3.2 Sapd information element";
         }
 
-        choice associated-cpd-id {
-          container vnf {
-            leaf vnfd-id {
-              mandatory true;
-              type leafref {
-                path "../../../../vnfd/id";
-              }
-              must "boolean(../../../vnfd-id[.=current()])";
+        container vnf {
+          leaf vnfd-id {
+            mandatory true;
+            type leafref {
+              path "../../../../vnfd/id";
             }
+            must "boolean(../../../vnfd-id[.=current()])";
+          }
 
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../vnfd-id)/../ext-cpd/id";
-              }
+          leaf ext-cpd-id {
+            mandatory true;
+            type leafref {
+              path "deref(../vnfd-id)/../ext-cpd/id";
             }
           }
+        }
 
-          container pnf {
-            leaf pnfd-id {
-              mandatory true;
-              type leafref {
-                path "../../../../pnfd/id";
-              }
-              must "boolean(../pnfd-id[.=current()])";
+        container pnf {
+          leaf pnfd-id {
+            mandatory true;
+            type leafref {
+              path "../../../../pnfd/id";
             }
+            must "boolean(../pnfd-id[.=current()])";
+          }
 
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../pnfd-id)/../ext-cpd/id";
-              }
+          leaf ext-cpd-id {
+            mandatory true;
+            type leafref {
+              path "deref(../pnfd-id)/../ext-cpd/id";
             }
           }
-          container ns {
-            leaf nsd-id {
-              mandatory true;
-              type leafref {
-                path "../../../../nsd/id";
-              }
-              must "boolean(../nsd-id[.=current()])";
+        }
+        container ns {
+          leaf nsd-id {
+            mandatory true;
+            type leafref {
+              path "../../../../nsd/id";
             }
+            must "boolean(../nsd-id[.=current()])";
+          }
 
-            leaf ext-cpd-id {
-              mandatory true;
-              type leafref {
-                path "deref(../nsd-id)/../sapd/id";
-              }
+          leaf ext-cpd-id {
+            mandatory true;
+            type leafref {
+              path "deref(../nsd-id)/../sapd/id";
             }
           }
         }
-- 
GitLab