Commit 9276ae60 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

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

#17 - affinityOrAntiAffinityGroupId should be a leaf-list and not a list

See merge request !74
parents 745f3f45 d5540561
Pipeline #2322 passed with stage
in 0 seconds
...@@ -162,9 +162,7 @@ ...@@ -162,9 +162,7 @@
<id>control-plane-active</id> <id>control-plane-active</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances> <max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
<nfvi-maintenance-info> <nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time> <impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info> </nfvi-maintenance-info>
...@@ -173,9 +171,7 @@ ...@@ -173,9 +171,7 @@
<id>control-plane-standby</id> <id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances> <max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
<nfvi-maintenance-info> <nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time> <impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info> </nfvi-maintenance-info>
...@@ -254,9 +250,7 @@ ...@@ -254,9 +250,7 @@
<id>control-plane-active</id> <id>control-plane-active</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances> <max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
<nfvi-maintenance-info> <nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time> <impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info> </nfvi-maintenance-info>
...@@ -265,9 +259,7 @@ ...@@ -265,9 +259,7 @@
<id>control-plane-standby</id> <id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances> <max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
<nfvi-maintenance-info> <nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time> <impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info> </nfvi-maintenance-info>
......
...@@ -791,21 +791,16 @@ submodule etsi-nfv-ns { ...@@ -791,21 +791,16 @@ submodule etsi-nfv-ns {
uses local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { leaf-list affinity-or-anti-affinity-group-id {
key "id"; type leafref {
path "../../affinity-or-anti-affinity-group/id";
}
description description
"Identifier(s) of the affinity or anti-affinity "Identifier(s) of the affinity or anti-affinity
group(s) the VnfProfile belongs to."; group(s) the VnfProfile belongs to.";
reference reference
"GS NFV IFA014: Section 6.3.3.2 VnfProfile information "GS NFV IFA014: Section 6.3.3.2 VnfProfile information
element"; element";
leaf id {
type leafref {
path "../../../affinity-or-anti-affinity-group/id";
}
}
} }
list virtual-link-connectivity { list virtual-link-connectivity {
...@@ -1003,9 +998,10 @@ submodule etsi-nfv-ns { ...@@ -1003,9 +998,10 @@ submodule etsi-nfv-ns {
uses local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { leaf-list affinity-or-anti-affinity-group-id {
key "id"; type leafref {
path "../../affinity-or-anti-affinity-group/id";
}
description description
"Identifies an affinity or anti-affinity group the "Identifies an affinity or anti-affinity group the
VLs instantiated according to the VlProfile belong VLs instantiated according to the VlProfile belong
...@@ -1013,12 +1009,6 @@ submodule etsi-nfv-ns { ...@@ -1013,12 +1009,6 @@ submodule etsi-nfv-ns {
reference reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile "GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element"; information element";
leaf id {
type leafref {
path "../../../affinity-or-anti-affinity-group/id";
}
}
} }
container max-bitrate-requirements { container max-bitrate-requirements {
...@@ -1451,21 +1441,16 @@ submodule etsi-nfv-ns { ...@@ -1451,21 +1441,16 @@ submodule etsi-nfv-ns {
element"; element";
} }
list affinity-or-anti-affinity-group-id { leaf-list affinity-or-anti-affinity-group-id {
key "id"; type leafref {
path "../../affinity-or-anti-affinity-group/id";
}
description description
"Identifies an affinity or anti-affinity group the NSs "Identifies an affinity or anti-affinity group the NSs
created according to this NsProfile belongs to."; created according to this NsProfile belongs to.";
reference reference
"GS NFV IFA014: Section 6.3.11.2 NsProfile information "GS NFV IFA014: Section 6.3.11.2 NsProfile information
element"; element";
leaf id {
type leafref {
path "../../../affinity-or-anti-affinity-group/id";
}
}
} }
list virtual-link-connectivity { list virtual-link-connectivity {
......
...@@ -1593,28 +1593,16 @@ submodule etsi-nfv-vnf { ...@@ -1593,28 +1593,16 @@ submodule etsi-nfv-vnf {
} }
uses local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { leaf-list affinity-or-anti-affinity-group-id {
key "id"; type leafref {
path "../../affinity-or-anti-affinity-group/id";
}
description description
"Identifier(s) of the affinity or anti-affinity "Identifier(s) of the affinity or anti-affinity
group(s) the VDU belongs to."; group(s) the VDU belongs to.";
reference reference
"GS NFV IFA011: Section 7.1.8.3, VduProfile information "GS NFV IFA011: Section 7.1.8.3, VduProfile information
element."; element.";
leaf id {
type leafref {
path "../../../" +
"affinity-or-anti-affinity-group/id";
}
description
"Identifies an affinity or anti-affinity group to
which the affinity or anti-affinity rule applies.";
reference
"GS NFV IFA011: Section 7.1.8.12, AffinityOrAntiAffinity
information element.";
}
} }
uses nfvi-maintenance-info { uses nfvi-maintenance-info {
...@@ -1662,13 +1650,10 @@ submodule etsi-nfv-vnf { ...@@ -1662,13 +1650,10 @@ submodule etsi-nfv-vnf {
} }
uses local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { leaf-list affinity-or-anti-affinity-group-id {
key "id"; type leafref {
leaf id { path "../../affinity-or-anti-affinity-group/id";
type leafref { }
path "../../../affinity-or-anti-affinity-group/id";
}
}
description description
"Identifier(s) of the affinity or anti-affinity "Identifier(s) of the affinity or anti-affinity
group(s) the VnfVirtualLinkDesc belongs to."; group(s) the VnfVirtualLinkDesc belongs to.";
......
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