Remove scaling-type. Added description to aggregation-type.

[osm/IM.git] / models / yang / mano-types.yang

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 8950c7a..3aa10a1 100644 (file)
--- 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
@@ -272,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;
         }
       }
@@ -639,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 {
@@ -1219,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;