X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fyang%2Fvnfd-base.yang;h=eb81021dab0320ad5dd6a3cef483a6b5c22ab5dd;hb=refs%2Ftags%2Fv6.0.4rc1;hp=8a43cb7ef1f50b881e56eb2f9c084656bd3a6d6f;hpb=64a85fd6a9f21b98c366ab45bce1ecea22bf9878;p=osm%2FIM.git

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 8a43cb7..eb81021 100644
--- 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 {
@@ -176,6 +176,7 @@ module vnfd-base
 
       container vnf-configuration {
         uses manotypes:vca-configuration;
+        uses manotypes:vca-config-access;
       }
 
       leaf operational-status {
@@ -417,7 +418,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;
@@ -443,6 +461,7 @@ module vnfd-base
 
         container vdu-configuration {
           uses manotypes:vca-configuration;
+          uses manotypes:vca-config-access;
         }
 
         list monitoring-param {