rel3 IM fixes - removed references to rw-pb and corrected config-primitive instead...

[osm/SO.git] / models / plugins / yang / vnfd-base.yang

diff --git a/models/plugins/yang/vnfd-base.yang b/models/plugins/yang/vnfd-base.yang
index 389bc69..c2eae35 100644 (file)
--- a/models/plugins/yang/vnfd-base.yang
+++ b/models/plugins/yang/vnfd-base.yang
@@ -160,7 +160,10 @@ module vnfd-base
         type string;
       }
 
-      uses manotypes:vnf-configuration;
+
+      container vnf-configuration {
+        uses manotypes:vca-configuration;
+      }
 
       container mgmt-interface {
         description
@@ -356,8 +359,19 @@ module vnfd-base
         uses manotypes:vswitch-epa;
         uses manotypes:hypervisor-epa;
         uses manotypes:host-epa;
+
+        list alarm {
+          key "alarm-id";
+
+          uses manotypes:alarm;
+        }
+
         uses manotypes:image-properties;
 
+        container vdu-configuration {
+          uses manotypes:vca-configuration;
+        }
+
         choice cloud-init-input {
           description
             "Indicates how the contents of cloud-init script are provided.