From 415f0a3228ebab99fb018f016a662dd063d84823 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Tue, 11 Feb 2020 18:46:58 -0800 Subject: [PATCH 1/2] nfv/SOL006#19 --- src/yang/etsi-nfv-common.yang | 1 + src/yang/etsi-nfv-ns.yang | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index b91ebf8..0b09fc4 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -386,6 +386,7 @@ submodule etsi-nfv-common { enum "zone-group"; enum "zone"; enum "nfvi-pop"; + enum "network-link-and-node"; } } diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang index d5dedb9..bca0abd 100644 --- a/src/yang/etsi-nfv-ns.yang +++ b/src/yang/etsi-nfv-ns.yang @@ -67,7 +67,7 @@ submodule etsi-nfv-ns { type affinity-scope; description "Specifies the scope of the rule, possible values are - 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; + 'NFVI-PoP', 'NFVI-node' network-link-and-node etc."; reference "GS NFV IFA014: Section 6.3.8.2, LocalAffinityOrAntiAffinityRule information element."; @@ -1168,7 +1168,8 @@ 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, etc."; + relationship e.g. a NFVI node, an NFVI PoP, + network-link-and-node etc."; reference "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity information element"; -- GitLab From 9969b96f83da76a1be7f7e6f41d861ca22f26500 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Fri, 14 Feb 2020 13:01:33 -0800 Subject: [PATCH 2/2] Update description in VNFD. --- src/yang/etsi-nfv-vnf.yang | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 3805f59..a28592e 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -196,8 +196,9 @@ submodule etsi-nfv-vnf { leaf scope { type affinity-scope; description - "Specifies the scope of the rule, possible values are - 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; + "Specifies the scope of the rule. Possible values are + 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node', and + 'network-link-and-node'."; reference "GS NFV IFA011: Section 7.1.8.11, LocalAffinityOrAntiAffinityRule information element."; @@ -2520,8 +2521,8 @@ submodule etsi-nfv-vnf { leaf id { type string; description - "Identifies an affinity or anti-affinity group to which - the affinity or anti-affinity rule applies."; + "Identifier of this AffinityOrAntiAffinityGroup + information element."; reference "GS NFV IFA011: Section 7.1.8.12 AffinityOrAntiAffinityGroup information element"; @@ -2531,8 +2532,8 @@ submodule etsi-nfv-vnf { mandatory true; type affinity-type; description - "Specifies whether the rule is an affinity rule or an - anti-affinity rule."; + "Specifies the type of relationship that the members of + the group have: 'affinity' or 'anti-affinity'."; reference "GS NFV IFA011: Section 7.1.8.12 AffinityOrAntiAffinityGroup information element"; @@ -2542,8 +2543,9 @@ submodule etsi-nfv-vnf { mandatory true; type affinity-scope; description - "Specifies the scope of the rule, possible values are - 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; + "Specifies the scope of the affinity or anti-affinity + relationship. Possible values are 'NFVI-PoP', 'Zone', + 'ZoneGroup', 'NFVI-node' and 'network-link-and-node'."; reference "GS NFV IFA011: Section 7.1.8.12 AffinityOrAntiAffinityGroup information element"; -- GitLab