From 46dfea570d9b0e2bc1610a7f7014e00fc7a400c0 Mon Sep 17 00:00:00 2001
From: Benjamin Diaz <bdiaz@whitestack.com>
Date: Wed, 20 Mar 2019 14:42:53 -0300
Subject: [PATCH] Modifies vnf alarm model to support vnf-monitoring-param-ref

Change-Id: I01a4da42026737e86ac3249f2480cb2788be1dec
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
---
 models/yang/mano-types.yang | 14 +-------------
 models/yang/vnfd-base.yang  | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang
index 2ff53e7..46472e7 100644
--- a/models/yang/mano-types.yang
+++ b/models/yang/mano-types.yang
@@ -1822,14 +1822,7 @@ module mano-types
     }
   }
 
-  grouping alarm {
-    leaf alarm-id {
-      description
-          "This field is reserved for the identifier assigned by the VIM provider";
-
-      type string;
-    }
-
+  grouping alarm-properties {
     leaf name {
       description "A human readable string to identify the alarm";
       type string;
@@ -1892,11 +1885,6 @@ module mano-types
       type alarm-severity-type;
     }
 
-    leaf metric {
-      description "The metric to be tracked by this alarm.";
-      type alarm-metric-type;
-    }
-
     leaf statistic {
       description "The type of metric statistic that is tracked by this alarm";
       type alarm-statistic-type;
diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index 8a43cb7..f176811 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -417,7 +417,24 @@ module vnfd-base
         list alarm {
           key "alarm-id";
 
-          uses manotypes:alarm;
+          leaf alarm-id {
+            description
+                  "This field is reserved for the identifier assigned by the VIM provider";
+
+            type string;
+          }
+
+
+          leaf vnf-monitoring-param-ref {
+              description
+                 "Reference to the VNF level monitoring parameter
+                  that is aggregated";
+              type leafref {
+                path "../../monitoring-param/id";
+              }
+          }
+
+          uses manotypes:alarm-properties;
         }
 
         uses manotypes:image-properties;
-- 
2.17.1