From b0e989a09ce43ccc6904c7d489158ed9ed42faff Mon Sep 17 00:00:00 2001 From: Preethika Date: Wed, 17 Feb 2021 05:53:57 +0000 Subject: [PATCH] issue#33 fix AffinityOrAntiAffinityGroup element information in vnfd and nsd Signed-off-by: Preethika --- example-data/complex-vnfd.xml | 4 ++-- src/yang/etsi-nfv-ns.yang | 15 +++++++++++---- src/yang/etsi-nfv-vnf.yang | 16 ++++++++++++---- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml index cf8048d..e1eaac6 100644 --- a/example-data/complex-vnfd.xml +++ b/example-data/complex-vnfd.xml @@ -240,7 +240,7 @@ control-plane - anti-affinity + anti-affinity nfvi-node @@ -328,7 +328,7 @@ control-plane - anti-affinity + anti-affinity nfvi-node diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang index 67100d9..f5ab803 100644 --- a/src/yang/etsi-nfv-ns.yang +++ b/src/yang/etsi-nfv-ns.yang @@ -1158,12 +1158,15 @@ submodule etsi-nfv-ns { information element"; } - leaf type { + leaf affinityorAntiaffinity { mandatory true; type affinity-type; description "Specifies the type of relationship that the members of - the group have: 'affinity' or 'anti-affinity.'"; + the group have. + Values: + • AFFINITY + • ANTI-AFFINITY"; reference "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity information element"; @@ -1174,8 +1177,12 @@ submodule etsi-nfv-ns { type affinity-scope; description "Specifies the scope of the affinity or anti-affinity - relationship e.g. a NFVI node, an NFVI PoP, - network-link-and-node etc."; + relationship. + Values: + • NFVI_NODE + • NFVI_POP + • NETWORK_LINK_AND_NODE + • etc."; reference "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity information element"; diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 6b5f2dc..05ca161 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -2535,12 +2535,15 @@ submodule etsi-nfv-vnf { AffinityOrAntiAffinityGroup information element"; } - leaf type { + leaf affinityorAntiaffinity { mandatory true; type affinity-type; description "Specifies the type of relationship that the members of - the group have: 'affinity' or 'anti-affinity'."; + the group have. + Values: + • AFFINITY + • ANTI-AFFINITY"; reference "GS NFV IFA011: Section 7.1.8.12 AffinityOrAntiAffinityGroup information element"; @@ -2551,8 +2554,13 @@ submodule etsi-nfv-vnf { type affinity-scope; description "Specifies the scope of the affinity or anti-affinity - relationship. Possible values are 'NFVI-PoP', 'Zone', - 'ZoneGroup', 'NFVI-node' and 'network-link-and-node'."; + relationship. + Values: + • NFVI-PoP + • Zone + • ZoneGroup + • NFVI-node + • network-link-and-node"; reference "GS NFV IFA011: Section 7.1.8.12 AffinityOrAntiAffinityGroup information element"; -- GitLab