Merge "Feature 5649: allow alternative images for specific VIMs in VNFD"

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 654fcbb..b6350ae 100644 (file)
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -202,6 +202,7 @@ module mano-types
              the same name as entered here.
             ";
       type string;
+      mandatory "true";
     }
 
     leaf image-checksum {

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 5e8d018..8e4333a 100644 (file)
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -391,6 +391,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;
         }