From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 12 Jun 2018 13:42:01 +0000 (+0200)
Subject: vnfd-base: add container inside choice case for each kind of monitoring-param
X-Git-Tag: BUILD_v4.0.1_1~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F6263%2F1;p=osm%2FIM.git

vnfd-base: add container inside choice case for each kind of monitoring-param

Change-Id: I201a8d0bc87a53e77d298f647afb52ca0d09a0e6
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang
index f98e2d2..a320ed1 100644
--- a/models/yang/vnfd-base.yang
+++ b/models/yang/vnfd-base.yang
@@ -837,37 +837,43 @@ module vnfd-base
 
           case vdu-monitoring-param {
             description "VDU-related metric from the infrastructure";
-            leaf vdu-ref {
-              type leafref {
-                path "../../vdu/id";
+            container vdu-monitoring-param {
+              leaf vdu-ref {
+                type leafref {
+                  path "../../../vdu/id";
+                }
               }
-            }
-            leaf vdu-monitoring-param-ref {
-              type leafref {
-                path "../../vdu[id = current()/../vdu-ref]/monitoring-param/id";
+              leaf vdu-monitoring-param-ref {
+                type leafref {
+                  path "../../../vdu[id = current()/../vdu-ref]/monitoring-param/id";
+                }
               }
             }
           }
 
           case vnf-metric {
             description "VNF-related metric (from VCA)";
-            leaf vnf-metric-name-ref {
-              type leafref {
-                path "../../vnf-configuration/metrics/name";
+            container vnf-metric {
+              leaf vnf-metric-name-ref {
+                type leafref {
+                  path "../../../vnf-configuration/metrics/name";
+                }
               }
             }
           }
 
           case vdu-metric {
             description "VDU-related metric (from VCA)";
-            leaf vdu-id-ref {
-              type leafref {
-                path "../../vdu/id";
+            container vdu-metric {
+              leaf vdu-ref {
+                type leafref {
+                  path "../../../vdu/id";
+                }
               }
-            }
-            leaf vdu-metric-name-ref {
-              type leafref {
-                path "../../vdu[id = current()/../vdu-id-ref]/vdu-configuration/metrics/name";
+              leaf vdu-metric-name-ref {
+                type leafref {
+                  path "../../../vdu[id = current()/../vdu-ref]/vdu-configuration/metrics/name";
+                }
               }
             }
           }