From 66adc6d16af6cc9f8ae4194feca1ddb7454c4765 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 13 Mar 2018 15:14:47 +0100
Subject: [PATCH] Remove scaling-type. Added description to aggregation-type.

Scaling-type has been removed since it should not be a descriptor
parameter.

Change-Id: Id263d886651eea3e183446cd9dd294fa4f8bdd69
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 models/yang/mano-types.yang |  7 ++++++-
 models/yang/nsd-base.yang   | 17 -----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 26eb420..3aa10a1 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -1224,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;
diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index aded995..f11ab22 100644
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -61,17 +61,6 @@ module nsd-base
     }
   }
 
-  typedef scaling-policy-type {
-    type enumeration {
-      enum manual {
-        value 1;
-      }
-      enum automatic {
-        value 2;
-      }
-    }
-  }
-
   typedef scaling-criteria-operation {
     type enumeration {
       enum AND {
@@ -270,12 +259,6 @@ module nsd-base
           type string;
         }
 
-        leaf scaling-type {
-          description
-              "Type of scaling";
-          type scaling-policy-type;
-        }
-
         leaf enabled {
           description
             "Specifies if the scaling policy can be applied";
-- 
2.17.1