Commit a2a98e0e authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

#16

parent f0c7490e
Pipeline #2258 passed with stage
in 0 seconds
...@@ -537,43 +537,6 @@ submodule etsi-nfv-common { ...@@ -537,43 +537,6 @@ submodule etsi-nfv-common {
} }
} }
grouping local-affinity-or-anti-affinity-rule {
list local-affinity-or-anti-affinity-rule {
key "type scope";
leaf type {
type affinity-type;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule.";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
}
leaf scope {
type affinity-scope;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
}
uses nfvi-maintenance-info {
description
"When present, provides information on the impact tolerance
and rules to be observed when a group of instances based
on the same VDU is impacted during NFVI operation and
maintenance (e.g. NFVI resource upgrades).";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
}
}
}
grouping connectivity-type { grouping connectivity-type {
container connectivity-type { container connectivity-type {
leaf-list layer-protocol { leaf-list layer-protocol {
......
...@@ -41,6 +41,31 @@ submodule etsi-nfv-ns { ...@@ -41,6 +41,31 @@ submodule etsi-nfv-ns {
} }
} }
grouping ns-local-affinity-or-anti-affinity-rule {
list local-affinity-or-anti-affinity-rule {
key "type scope";
leaf type {
type affinity-type;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule.";
reference
"GS NFV IFA014: Section 6.3.8.2,
LocalAffinityOrAntiAffinityRule information element.";
}
leaf scope {
type affinity-scope;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
reference
"GS NFV IFA014: Section 6.3.8.2,
LocalAffinityOrAntiAffinityRule information element.";
}
}
}
grouping nsd { grouping nsd {
leaf id { leaf id {
...@@ -790,7 +815,7 @@ submodule etsi-nfv-ns { ...@@ -790,7 +815,7 @@ submodule etsi-nfv-ns {
element"; element";
} }
uses local-affinity-or-anti-affinity-rule; uses ns-local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
...@@ -1002,7 +1027,7 @@ submodule etsi-nfv-ns { ...@@ -1002,7 +1027,7 @@ submodule etsi-nfv-ns {
information element"; information element";
} }
uses local-affinity-or-anti-affinity-rule; uses ns-local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
......
...@@ -171,6 +171,43 @@ submodule etsi-nfv-vnf { ...@@ -171,6 +171,43 @@ submodule etsi-nfv-vnf {
} }
} }
grouping vnf-local-affinity-or-anti-affinity-rule {
list local-affinity-or-anti-affinity-rule {
key "type scope";
leaf type {
type affinity-type;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule.";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
}
leaf scope {
type affinity-scope;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
}
uses nfvi-maintenance-info {
description
"When present, provides information on the impact tolerance
and rules to be observed when a group of instances based
on the same VDU is impacted during NFVI operation and
maintenance (e.g. NFVI resource upgrades).";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
}
}
}
grouping vnfd { grouping vnfd {
leaf id { leaf id {
type string; type string;
...@@ -1591,7 +1628,7 @@ submodule etsi-nfv-vnf { ...@@ -1591,7 +1628,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.3, VduProfile information "GS NFV IFA011: Section 7.1.8.3, VduProfile information
element."; element.";
} }
uses local-affinity-or-anti-affinity-rule; uses vnf-local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
...@@ -1660,7 +1697,7 @@ submodule etsi-nfv-vnf { ...@@ -1660,7 +1697,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile "GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
information element."; information element.";
} }
uses local-affinity-or-anti-affinity-rule; uses vnf-local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
......
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