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

diff --combined models/yang/mano-types.yang
index 654fcbb,ce51c70..b6350ae
--- 1/models/yang/mano-types.yang
--- 2/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@@ -191,7 -191,7 +191,7 @@@ module mano-type
        }
      }
    }
 -  
 +
   grouping image-properties {
      leaf image {
        description
@@@ -202,6 -202,7 +202,7 @@@
               the same name as entered here.
              ";
        type string;
+       mandatory "true";
      }
  
      leaf image-checksum {
@@@ -272,11 -273,6 +273,11 @@@
              description "Juju charm to use with the VNF or VDU.";
              type string;
            }
 +          leaf proxy {
 +            description "Is this a proxy charm?";
 +            type boolean;
 +            default true;
 +          }
            uses manotypes:vca-relationships;
          }
        }