Re-enabling NS primitives, config-primitive over service-primitive, clean-up

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

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index ce637d2..0cd8e45 100644 (file)
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -20,7 +20,7 @@
 
 module vnfd-base
 {
-  namespace "http://riftio.com/ns/riftware-1.0/vnfd-base";
+  namespace "urn:etsi:osm:yang:vnfd-base";
   prefix "vnfd-base";
 
   import mano-types {
@@ -417,7 +417,24 @@ module vnfd-base
         list alarm {
           key "alarm-id";
 
-          uses manotypes:alarm;
+          leaf alarm-id {
+            description
+                  "This field is reserved for the identifier assigned by the VIM provider";
+
+            type string;
+          }
+
+
+          leaf vnf-monitoring-param-ref {
+              description
+                 "Reference to the VNF level monitoring parameter
+                  that is aggregated";
+              type leafref {
+                path "../../monitoring-param/id";
+              }
+          }
+
+          uses manotypes:alarm-properties;
         }
 
         uses manotypes:image-properties;
@@ -721,7 +738,9 @@ module vnfd-base
             leaf scale-in-threshold {
               description
                   "Value below which scale-in requests are generated";
-              type uint64;
+              type decimal64{
+                fraction-digits 10;
+             }
             }
 
             leaf scale-in-relational-operation {
@@ -735,7 +754,9 @@ module vnfd-base
             leaf scale-out-threshold {
               description
                   "Value above which scale-out requests are generated";
-              type uint64;
+              type decimal64{
+                fraction-digits 10;
+             }
             }
 
             leaf scale-out-relational-operation {