From d5540561c08fd4ec57be2c4ed9c8fdae158582ef Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Wed, 15 Jan 2020 15:17:11 -0800 Subject: [PATCH] nfv/SOL006#17 --- example-data/complex-vnfd.xml | 16 ++++---------- src/yang/etsi-nfv-ns.yang | 39 +++++++++++------------------------ src/yang/etsi-nfv-vnf.yang | 31 +++++++--------------------- 3 files changed, 24 insertions(+), 62 deletions(-) diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml index a4bdf47..cf8048d 100644 --- a/example-data/complex-vnfd.xml +++ b/example-data/complex-vnfd.xml @@ -162,9 +162,7 @@ control-plane-active 1 1 - - control-plane - + control-plane 1 @@ -173,9 +171,7 @@ control-plane-standby 1 1 - - control-plane - + control-plane 1 @@ -254,9 +250,7 @@ control-plane-active 1 1 - - control-plane - + control-plane 1 @@ -265,9 +259,7 @@ control-plane-standby 1 1 - - control-plane - + control-plane 1 diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang index fd41598..ad022ad 100644 --- a/src/yang/etsi-nfv-ns.yang +++ b/src/yang/etsi-nfv-ns.yang @@ -792,21 +792,16 @@ submodule etsi-nfv-ns { uses local-affinity-or-anti-affinity-rule; - list affinity-or-anti-affinity-group { - key "id"; - + leaf-list affinity-or-anti-affinity-group-id { + type leafref { + path "../../affinity-or-anti-affinity-group/id"; + } description "Identifier(s) of the affinity or anti-affinity group(s) the VnfProfile belongs to."; reference "GS NFV IFA014: Section 6.3.3.2 VnfProfile information element"; - - leaf id { - type leafref { - path "../../../affinity-or-anti-affinity-group/id"; - } - } } list virtual-link-connectivity { @@ -1004,9 +999,10 @@ submodule etsi-nfv-ns { uses local-affinity-or-anti-affinity-rule; - list affinity-or-anti-affinity-group { - key "id"; - + leaf-list affinity-or-anti-affinity-group-id { + type leafref { + path "../../affinity-or-anti-affinity-group/id"; + } description "Identifies an affinity or anti-affinity group the VLs instantiated according to the VlProfile belong @@ -1014,12 +1010,6 @@ submodule etsi-nfv-ns { reference "GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile information element"; - - leaf id { - type leafref { - path "../../../affinity-or-anti-affinity-group/id"; - } - } } container max-bitrate-requirements { @@ -1452,21 +1442,16 @@ submodule etsi-nfv-ns { element"; } - list affinity-or-anti-affinity-group-id { - key "id"; - + leaf-list affinity-or-anti-affinity-group-id { + type leafref { + path "../../affinity-or-anti-affinity-group/id"; + } description "Identifies an affinity or anti-affinity group the NSs created according to this NsProfile belongs to."; reference "GS NFV IFA014: Section 6.3.11.2 NsProfile information element"; - - leaf id { - type leafref { - path "../../../affinity-or-anti-affinity-group/id"; - } - } } list virtual-link-connectivity { diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 135b36d..37017c0 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -1593,28 +1593,16 @@ submodule etsi-nfv-vnf { } uses local-affinity-or-anti-affinity-rule; - list affinity-or-anti-affinity-group { - key "id"; - + leaf-list affinity-or-anti-affinity-group-id { + type leafref { + path "../../affinity-or-anti-affinity-group/id"; + } description "Identifier(s) of the affinity or anti-affinity group(s) the VDU belongs to."; reference "GS NFV IFA011: Section 7.1.8.3, VduProfile information element."; - - leaf id { - type leafref { - path "../../../" + - "affinity-or-anti-affinity-group/id"; - } - description - "Identifies an affinity or anti-affinity group to - which the affinity or anti-affinity rule applies."; - reference - "GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity - information element."; - } } uses nfvi-maintenance-info { @@ -1662,13 +1650,10 @@ submodule etsi-nfv-vnf { } uses local-affinity-or-anti-affinity-rule; - list affinity-or-anti-affinity-group { - key "id"; - leaf id { - type leafref { - path "../../../affinity-or-anti-affinity-group/id"; - } - } + leaf-list affinity-or-anti-affinity-group-id { + type leafref { + path "../../affinity-or-anti-affinity-group/id"; + } description "Identifier(s) of the affinity or anti-affinity group(s) the VnfVirtualLinkDesc belongs to."; -- GitLab