Commit a861598f authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'issue#19' into 'dev-v3.3.1'

SOL006ed331 FEAT10 IFA014 Augment anti-affinity scope

See merge request !76
parents b5f2bb69 9969b96f
Pipeline #2802 passed with stage
in 0 seconds
...@@ -386,6 +386,7 @@ submodule etsi-nfv-common { ...@@ -386,6 +386,7 @@ submodule etsi-nfv-common {
enum "zone-group"; enum "zone-group";
enum "zone"; enum "zone";
enum "nfvi-pop"; enum "nfvi-pop";
enum "network-link-and-node";
} }
} }
......
...@@ -67,7 +67,7 @@ submodule etsi-nfv-ns { ...@@ -67,7 +67,7 @@ submodule etsi-nfv-ns {
type affinity-scope; type affinity-scope;
description description
"Specifies the scope of the rule, possible values are "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 reference
"GS NFV IFA014: Section 6.3.8.2, "GS NFV IFA014: Section 6.3.8.2,
LocalAffinityOrAntiAffinityRule information element."; LocalAffinityOrAntiAffinityRule information element.";
...@@ -1168,7 +1168,8 @@ submodule etsi-nfv-ns { ...@@ -1168,7 +1168,8 @@ submodule etsi-nfv-ns {
type affinity-scope; type affinity-scope;
description description
"Specifies the scope of the affinity or anti-affinity "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 reference
"GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity "GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
information element"; information element";
......
...@@ -196,8 +196,9 @@ submodule etsi-nfv-vnf { ...@@ -196,8 +196,9 @@ submodule etsi-nfv-vnf {
leaf scope { leaf scope {
type affinity-scope; type affinity-scope;
description description
"Specifies the scope of the rule, possible values are "Specifies the scope of the rule. Possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node', and
'network-link-and-node'.";
reference reference
"GS NFV IFA011: Section 7.1.8.11, "GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element."; LocalAffinityOrAntiAffinityRule information element.";
...@@ -2520,8 +2521,8 @@ submodule etsi-nfv-vnf { ...@@ -2520,8 +2521,8 @@ submodule etsi-nfv-vnf {
leaf id { leaf id {
type string; type string;
description description
"Identifies an affinity or anti-affinity group to which "Identifier of this AffinityOrAntiAffinityGroup
the affinity or anti-affinity rule applies."; information element.";
reference reference
"GS NFV IFA011: Section 7.1.8.12 "GS NFV IFA011: Section 7.1.8.12
AffinityOrAntiAffinityGroup information element"; AffinityOrAntiAffinityGroup information element";
...@@ -2531,8 +2532,8 @@ submodule etsi-nfv-vnf { ...@@ -2531,8 +2532,8 @@ submodule etsi-nfv-vnf {
mandatory true; mandatory true;
type affinity-type; type affinity-type;
description description
"Specifies whether the rule is an affinity rule or an "Specifies the type of relationship that the members of
anti-affinity rule."; the group have: 'affinity' or 'anti-affinity'.";
reference reference
"GS NFV IFA011: Section 7.1.8.12 "GS NFV IFA011: Section 7.1.8.12
AffinityOrAntiAffinityGroup information element"; AffinityOrAntiAffinityGroup information element";
...@@ -2542,8 +2543,9 @@ submodule etsi-nfv-vnf { ...@@ -2542,8 +2543,9 @@ submodule etsi-nfv-vnf {
mandatory true; mandatory true;
type affinity-scope; type affinity-scope;
description description
"Specifies the scope of the rule, possible values are "Specifies the scope of the affinity or anti-affinity
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; relationship. Possible values are 'NFVI-PoP', 'Zone',
'ZoneGroup', 'NFVI-node' and 'network-link-and-node'.";
reference reference
"GS NFV IFA011: Section 7.1.8.12 "GS NFV IFA011: Section 7.1.8.12
AffinityOrAntiAffinityGroup information element"; AffinityOrAntiAffinityGroup information element";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment