Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NFV - Network Functions Virtualisation
SOL006
Commits
67f4d948
Commit
67f4d948
authored
Feb 11, 2020
by
jethanandani
Browse files
Merge branch 'issue#16' into 'dev-v3.3.1'
#16
- Correct
#12
that implemented FEAT03 NFVI MOD See merge request
!73
parents
9276ae60
a2a98e0e
Pipeline
#2464
passed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/yang/etsi-nfv-common.yang
View file @
67f4d948
...
...
@@ -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
{
container
connectivity-type
{
leaf-list
layer-protocol
{
...
...
src/yang/etsi-nfv-ns.yang
View file @
67f4d948
...
...
@@ -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
{
leaf
id
{
...
...
@@ -789,7 +814,7 @@ submodule etsi-nfv-ns {
element"
;
}
uses
local-affinity-or-anti-affinity-rule
;
uses
ns-
local-affinity-or-anti-affinity-rule
;
leaf-list
affinity-or-anti-affinity-group-id
{
type
leafref
{
...
...
@@ -996,7 +1021,7 @@ submodule etsi-nfv-ns {
information element"
;
}
uses
local-affinity-or-anti-affinity-rule
;
uses
ns-
local-affinity-or-anti-affinity-rule
;
leaf-list
affinity-or-anti-affinity-group-id
{
type
leafref
{
...
...
src/yang/etsi-nfv-vnf.yang
View file @
67f4d948
...
...
@@ -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
{
leaf
id
{
type
string
;
...
...
@@ -1591,7 +1628,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.3, VduProfile information
element."
;
}
uses
local-affinity-or-anti-affinity-rule
;
uses
vnf-
local-affinity-or-anti-affinity-rule
;
leaf-list
affinity-or-anti-affinity-group-id
{
type
leafref
{
...
...
@@ -1648,7 +1685,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
information element."
;
}
uses
local-affinity-or-anti-affinity-rule
;
uses
vnf-
local-affinity-or-anti-affinity-rule
;
leaf-list
affinity-or-anti-affinity-group-id
{
type
leafref
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment