From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 9 Apr 2019 13:12:41 +0000 (+0200)
Subject: Support of NS primitives via charms
X-Git-Tag: v6.0.0~10
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=634a26ff7428df4008a178667c6f1ef06f5071c1;ds=sidebyside

Support of NS primitives via charms

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

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
diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 3f358a5..42cc0fc 100644
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -554,6 +554,10 @@ module nsd-base
 
     uses manotypes:ip-profile-list;
 
+    container ns-configuration {
+      uses manotypes:ns-configuration;
+    }
+
     list initial-service-primitive {
       description
         "Initial set of service primitives for NSD.";
diff --git a/models/yang/nsr.yang b/models/yang/nsr.yang
index 48ac592..520252b 100644
--- a/models/yang/nsr.yang
+++ b/models/yang/nsr.yang
@@ -882,6 +882,10 @@ module nsr
           type ns-operational-status;
         }
 
+        container ns-configuration {
+          uses manotypes:vca-configuration;
+        }
+
         leaf config-status {
           description
             "The configuration status of the NS instance