X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fmano-types.yang;h=d34a9c5539b18fec77d85f8f7026d39efe208c99;hp=dbf2ba21e65c98c5c22d1c87eb0821df4337c3e7;hb=a3c3ec9802462ebbf40574a97917a8313eb7dfe6;hpb=bbfb53f73103e6fb47c1a039eff164eb723e2e10

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index dbf2ba2..d34a9c5 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
@@ -358,6 +371,29 @@ module mano-types
       }
     }
 
+    list terminate-config-primitive {
+      description
+        "Terminate set of configuration primitives.";
+      key "seq";
+      leaf seq {
+        description
+          "Sequence number for the configuration primitive.";
+        type uint64;
+      }
+      leaf name {
+        description
+          "Name of the configuration primitive.";
+        type string;
+      }
+
+      uses primitive-parameter-value;
+
+      leaf user-defined-script {
+        description
+          "A user defined script.";
+        type string;
+      }
+    }
     uses manotypes:vca-metrics;
 
   } // END - grouping vca-configuration
@@ -1836,14 +1872,7 @@ module mano-types
     }
   }
 
-  grouping alarm {
-    leaf alarm-id {
-      description
-          "This field is reserved for the identifier assigned by the VIM provider";
-
-      type string;
-    }
-
+  grouping alarm-properties {
     leaf name {
       description "A human readable string to identify the alarm";
       type string;
@@ -1906,11 +1935,6 @@ module mano-types
       type alarm-severity-type;
     }
 
-    leaf metric {
-      description "The metric to be tracked by this alarm.";
-      type alarm-metric-type;
-    }
-
     leaf statistic {
       description "The type of metric statistic that is tracked by this alarm";
       type alarm-statistic-type;