X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fmano-types.yang;h=e042c449758569fcb22e1d149e8576cbfcb58ff5;hp=d5207d9f42ceed6ea1bc6072663e9783c4efa298;hb=refs%2Fchanges%2F00%2F7100%2F6;hpb=d6e6ffb844ad09033d9f519baa313cb3c7e44fb1

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index d5207d9..e042c44 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -257,13 +257,7 @@ module mano-types
     }
   } // END - grouping vca-metrics
 
-  grouping vca-configuration {
-    description
-        "Information about the VNF or VDU configuration. Note:
-         If the NS contains multiple instances of the
-         same VNF or VDU, each instance could have a different
-         configuration.";
-
+  grouping configuration-method {
     choice config-method {
       description
           "Defines the configuration method for the VNF or VDU.";
@@ -301,6 +295,25 @@ 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
+        "Information about the VNF or VDU configuration. Note:
+         If the NS contains multiple instances of the
+         same VNF or VDU, each instance could have a different
+         configuration.";
+
+    uses manotypes:configuration-method;
 
     list config-primitive {
       description