diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index a4bdf477338242bb5049c33fc439eaa4e4922423..cf8048d9ed6ecdf8099420b9fb2e393ad4a0151e 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -162,9 +162,7 @@
control-plane-active
1
1
-
- control-plane
-
+ control-plane
1
@@ -173,9 +171,7 @@
control-plane-standby
1
1
-
- control-plane
-
+ control-plane
1
@@ -254,9 +250,7 @@
control-plane-active
1
1
-
- control-plane
-
+ control-plane
1
@@ -265,9 +259,7 @@
control-plane-standby
1
1
-
- control-plane
-
+ control-plane
1
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index fd4159851866e698d4a0be3284ca92312507e93a..ad022ad03de7f8ead5ff94a365e957a708ca58a6 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -792,21 +792,16 @@ submodule etsi-nfv-ns {
uses local-affinity-or-anti-affinity-rule;
- list affinity-or-anti-affinity-group {
- key "id";
-
+ leaf-list affinity-or-anti-affinity-group-id {
+ type leafref {
+ path "../../affinity-or-anti-affinity-group/id";
+ }
description
"Identifier(s) of the affinity or anti-affinity
group(s) the VnfProfile belongs to.";
reference
"GS NFV IFA014: Section 6.3.3.2 VnfProfile information
element";
-
- leaf id {
- type leafref {
- path "../../../affinity-or-anti-affinity-group/id";
- }
- }
}
list virtual-link-connectivity {
@@ -1004,9 +999,10 @@ submodule etsi-nfv-ns {
uses local-affinity-or-anti-affinity-rule;
- list affinity-or-anti-affinity-group {
- key "id";
-
+ leaf-list affinity-or-anti-affinity-group-id {
+ type leafref {
+ path "../../affinity-or-anti-affinity-group/id";
+ }
description
"Identifies an affinity or anti-affinity group the
VLs instantiated according to the VlProfile belong
@@ -1014,12 +1010,6 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
-
- leaf id {
- type leafref {
- path "../../../affinity-or-anti-affinity-group/id";
- }
- }
}
container max-bitrate-requirements {
@@ -1452,21 +1442,16 @@ submodule etsi-nfv-ns {
element";
}
- list affinity-or-anti-affinity-group-id {
- key "id";
-
+ leaf-list affinity-or-anti-affinity-group-id {
+ type leafref {
+ path "../../affinity-or-anti-affinity-group/id";
+ }
description
"Identifies an affinity or anti-affinity group the NSs
created according to this NsProfile belongs to.";
reference
"GS NFV IFA014: Section 6.3.11.2 NsProfile information
element";
-
- leaf id {
- type leafref {
- path "../../../affinity-or-anti-affinity-group/id";
- }
- }
}
list virtual-link-connectivity {
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 135b36daab50f0a1ff6ba4605f975080d5241fc9..37017c06b6d046507c19ec7179246ba58be86a5a 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -1593,28 +1593,16 @@ submodule etsi-nfv-vnf {
}
uses local-affinity-or-anti-affinity-rule;
- list affinity-or-anti-affinity-group {
- key "id";
-
+ leaf-list affinity-or-anti-affinity-group-id {
+ type leafref {
+ path "../../affinity-or-anti-affinity-group/id";
+ }
description
"Identifier(s) of the affinity or anti-affinity
group(s) the VDU belongs to.";
reference
"GS NFV IFA011: Section 7.1.8.3, VduProfile information
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 {
@@ -1662,13 +1650,10 @@ submodule etsi-nfv-vnf {
}
uses local-affinity-or-anti-affinity-rule;
- list affinity-or-anti-affinity-group {
- key "id";
- leaf id {
- type leafref {
- path "../../../affinity-or-anti-affinity-group/id";
- }
- }
+ leaf-list affinity-or-anti-affinity-group-id {
+ type leafref {
+ path "../../affinity-or-anti-affinity-group/id";
+ }
description
"Identifier(s) of the affinity or anti-affinity
group(s) the VnfVirtualLinkDesc belongs to.";