From: garciadeblas Date: Tue, 12 Jun 2018 13:43:51 +0000 (+0200) Subject: add vdur and vnfr monitoring-param lists. Fixes IM tree view generation X-Git-Tag: BUILD_v4.0.1_1~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F6264%2F1;p=osm%2FIM.git add vdur and vnfr monitoring-param lists. Fixes IM tree view generation Change-Id: Id144349f90d702c5685b742773edc2e5923d6bf6 Signed-off-by: garciadeblas --- diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang index aff7af4..ef2edde 100644 --- a/models/yang/vnfr.yang +++ b/models/yang/vnfr.yang @@ -447,6 +447,30 @@ module vnfr uses manotypes:vca-configuration; } + list monitoring-param { + description + "List of VDU-related monitoring parameters at NFVI level"; + key id; + leaf id { + description "The unique id of the monitoring param at VDU level"; + type string; + } + + leaf nfvi-metric { + description "The associated NFVI metric to be monitored"; + type manotypes:nfvi-metric-type; + } + + leaf interface-name-ref { + description + "Reference to a VDU interface name. Applicable only when the nfvi-metric + refers to an interface and not to the VM"; + type leafref { + path "../../interface/name"; + } + } + } + list volumes { key "name"; @@ -563,7 +587,74 @@ module vnfr uses placement-group-info; } - uses manotypes:monitoring-param; + list monitoring-param { + description + "List of monitoring parameters at the network service level"; + key id; + leaf id { + type string; + } + + leaf name { + type string; + } + + uses manotypes:monitoring-param-aggregation; + + choice monitoring-type { + description + "Defines the type of monitoring param to be used: + * vdu-monitorin-param: VDU-related metric (from NFVI) + * vnf-metric: VNF-related metric (from VCA) + * vdu-metric: VDU-related metric (from VCA) + "; + + case vdu-monitoring-param { + description "VDU-related metric from the infrastructure"; + container vdu-monitoring-param { + leaf vdu-ref { + type leafref { + path "../../../vdur/id"; + } + } + leaf vdu-monitoring-param-ref { + type leafref { + path "../../../vdur[id = current()/../vdu-ref]/monitoring-param/id"; + } + } + } + } + + case vnf-metric { + description "VNF-related metric (from VCA)"; + container vnf-metric { + leaf vnf-metric-name-ref { + type leafref { + path "../../../vnf-configuration/metrics/name"; + } + } + } + } + + case vdu-metric { + description "VDU-related metric (from VCA)"; + container vdu-metric { + leaf vdu-ref { + type leafref { + path "../../../vdur/id"; + } + } + leaf vdu-metric-name-ref { + type leafref { + path "../../../vdur[id = current()/../vdu-ref]/vdu-configuration/metrics/name"; + } + } + } + } + + } + + } leaf operational-status { description