X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fmano-types.yang;h=3aa10a14a26af9f82bab40a74dce07faa10873fd;hp=ce51c70c3be63937f3e44633244a2122ae158b11;hb=66adc6d16af6cc9f8ae4194feca1ddb7454c4765;hpb=e304a4dfc53b76d714238e42a52f45422d478ae0

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index ce51c70..3aa10a1 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -191,7 +191,7 @@ module mano-types
       }
     }
   }
-  
+
  grouping image-properties {
     leaf image {
       description
@@ -202,7 +202,6 @@ module mano-types
              the same name as entered here.
             ";
       type string;
-      mandatory "true";
     }
 
     leaf image-checksum {
@@ -273,6 +272,11 @@ module mano-types
             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;
         }
       }
@@ -640,12 +644,12 @@ module mano-types
     }
   } //grouping vm-flavor
 
-	grouping vm-flavor-name {
-  	leaf vm-flavor-name {
-  		description "flavor name to be used while creating vm using cloud account";
-  		type string;
-  	}
-	}
+  grouping vm-flavor-name {
+    leaf vm-flavor-name {
+      description "flavor name to be used while creating vm using cloud account";
+      type string;
+    }
+  }
 
   grouping vswitch-epa {
     container vswitch-epa {
@@ -1220,7 +1224,12 @@ module mano-types
 
   grouping monitoring-param-aggregation {
     typedef aggregation-type {
-      description "aggregation-type";
+      description
+          "aggregation-type, indicates the way to aggregate monitoring-params
+          (e.g. how to aggregate CPU utilisation of all VNFs belonging to the
+          same VNF group identified by member-vnf-index; or how to aggregate
+          memory utilisation of all VDUs belonging to the same VDU group
+          identified by vdu id)";
       type enumeration {
         enum AVERAGE;
         enum MINIMUM;