Merge "Set default true to 'port-security-enable'"

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

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 5e8d018..3ab3eab 100644 (file)
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -64,6 +64,7 @@ module vnfd-base
     leaf port-security-enabled {
       description "Enables the port security for the port";
       type boolean;
+      default true;
     }
   }
 
@@ -303,6 +304,10 @@ module vnfd-base
               path "../../../vdu/internal-connection-point/id";
             }
           }
+          leaf ip-address {
+            description "IP address of the internal connection point";
+            type inet:ip-address;
+          }
         }
 
         uses manotypes:provider-network;
@@ -391,6 +396,25 @@ module vnfd-base
 
         uses manotypes:image-properties;
 
+        list alternative-images {
+          key "vim-type";
+          description
+            "List of alternative images per VIM type.
+            Different images can be used for specific types of VIMs instead
+            of the default image. This allows deployments in sites where the
+            image identifier in the VIM is given by the VIM provider and
+            cannot be modified.
+            If an alternative image is specified for a VIM type, it will prevail
+            over the default image";
+
+          leaf vim-type {
+            description "VIM type: openvim, openstack, vmware, aws, etc.";
+            type string;
+          }
+
+          uses manotypes:image-properties;
+        }
+
         container vdu-configuration {
           uses manotypes:vca-configuration;
         }