Removed ns-configuration grouping; updated descriptions

Change-Id: Ia6c264e0aa8c20eee5aef51b86c243b2daee4782
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 34d7782..1b9e141 100644 (file)
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -297,19 +297,10 @@ module mano-types
     }
   }
 
     }
   }
 

-  grouping ns-configuration {
-    description
-        "Information about NS configuration. Note:
-         In the future this should be equivalent to vca-configuration
-         grouping.";
-
-    uses manotypes:configuration-method;
-  }
-

   grouping vca-configuration {
     description
   grouping vca-configuration {
     description

-        "Information about the VNF or VDU configuration. Note:
-         If the NS contains multiple instances of the
+        "Common information in the descriptors for NS, VNF or VDU configuration.
+         Note: If the NS contains multiple instances of the

          same VNF or VDU, each instance could have a different
          configuration.";
 
          same VNF or VDU, each instance could have a different
          configuration.";
 

diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 45ca7f7..2eeabc5 100644 (file)
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -555,6 +555,9 @@ module nsd-base
     uses manotypes:ip-profile-list;
 
     container ns-configuration {
     uses manotypes:ip-profile-list;
 
     container ns-configuration {

+      description
+        "Information about NS configuration.";
+

       uses manotypes:vca-configuration;
     }
 
       uses manotypes:vca-configuration;
     }