VNFD and NSD updated to support VDU and NS scaling from NFVI and VNF metrics

[osm/IM.git] / models / yang / nsd-base.yang

diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index aded995..df99563 100644 (file)
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -61,17 +61,6 @@ module nsd-base
     }
   }
 
-  typedef scaling-policy-type {
-    type enumeration {
-      enum manual {
-        value 1;
-      }
-      enum automatic {
-        value 2;
-      }
-    }
-  }
-
   typedef scaling-criteria-operation {
     type enumeration {
       enum AND {
@@ -273,7 +262,7 @@ module nsd-base
         leaf scaling-type {
           description
               "Type of scaling";
-          type scaling-policy-type;
+          type manotypes:scaling-policy-type;
         }
 
         leaf enabled {
@@ -288,7 +277,7 @@ module nsd-base
               "Operation to be applied to check between scaling criterias to
                check if the scale in threshold condition has been met.
                Defaults to AND";
-          type scaling-criteria-operation;
+          type manotypes:scaling-criteria-operation;
           default AND;
         }
 
@@ -297,7 +286,7 @@ module nsd-base
               "Operation to be applied to check between scaling criterias to
                check if the scale out threshold condition has been met.
                Defauls to OR";
-          type scaling-criteria-operation;
+          type manotypes:scaling-criteria-operation;
           default OR;
         }
 
@@ -332,12 +321,28 @@ module nsd-base
             type uint64;
           }
 
+          leaf scale-in-relational-operation {
+            description
+              "The relational operator used to compare the monitoring param
+              against the scale-in-threshold.";
+            type manotypes:relational-operation-type;
+            default LE;
+          }
+
           leaf scale-out-threshold {
             description
                 "Value above which scale-out requests are generated";
             type uint64;
           }
 
+          leaf scale-out-relational-operation {
+            description
+              "The relational operator used to compare the monitoring param
+              against the scale-out-threshold.";
+            type manotypes:relational-operation-type;
+            default GE;
+          }
+
           leaf ns-monitoring-param-ref {
             description
                "Reference to the NS level monitoring parameter
@@ -395,7 +400,7 @@ module nsd-base
 
         leaf trigger {
           description "scaling trigger";
-          type scaling-trigger;
+          type manotypes:scaling-trigger;
         }
 
         leaf ns-service-primitive-name-ref {