diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 92db22da2c2bf0a21920310c7d5a8c1eae2d4aa3..ddf78072a078ef78a2bb07a6439747e389353b4b 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -11,17 +11,14 @@
Firewall VDU
inside
- inside
Ethernet
management
- management
Ethernet
outside
- outside
Ethernet
asa-vcd
@@ -97,17 +94,14 @@
Router VDU
left
- left
Ethernet
management
- management
Ethernet
right
- right
Ethernet
csr-vcd
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 2795b7ff241124b3942e7a5fad374f16fbca3f06..4a8ccabeb8a18576a2e3bd6d9d45433308325555 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -4,10 +4,7 @@ submodule etsi-nfv-ns {
prefix nfv;
}
- import etsi-nfv-common {
- prefix common;
- }
-
+ include etsi-nfv-common;
include etsi-nfv-vnf;
include etsi-nfv-pnf;
@@ -345,7 +342,7 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc
information element";
}
- uses common:security-parameters;
+ uses security-parameters;
}
list vnffgd {
@@ -776,7 +773,7 @@ submodule etsi-nfv-ns {
element";
}
- uses common:local-affinity-or-anti-affinity-rule;
+ uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
@@ -988,7 +985,7 @@ submodule etsi-nfv-ns {
information element";
}
- uses common:local-affinity-or-anti-affinity-rule;
+ uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
@@ -1015,7 +1012,7 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
- uses common:link-bitrate-requirements;
+ uses link-bitrate-requirements;
}
container min-bitrate-requirements {
description
@@ -1024,7 +1021,7 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
- uses common:link-bitrate-requirements;
+ uses link-bitrate-requirements;
}
}
@@ -1104,7 +1101,7 @@ submodule etsi-nfv-ns {
leaf affinity-type {
mandatory true;
- type common:affinity-type;
+ type affinity-type;
description
"Specifies the type of relationship that the members of
the group have: 'affinity' or 'anti-affinity.'";
@@ -1115,7 +1112,7 @@ submodule etsi-nfv-ns {
leaf affinity-scope {
mandatory true;
- type common:affinity-scope;
+ type affinity-scope;
description
"Specifies the scope of the affinity or anti-affinity
relationship e.g. a NFVI node, an NFVI PoP, etc.";
@@ -1212,7 +1209,7 @@ submodule etsi-nfv-ns {
VirtualLinkToLevelMapping information element";
}
- uses common:link-bitrate-requirements;
+ uses link-bitrate-requirements;
}
list ns-to-level-mapping {
@@ -1567,7 +1564,7 @@ submodule etsi-nfv-ns {
}
}
}
- uses common:security-parameters;
+ uses security-parameters;
}
}
}
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 19827899615e6ce07f260c63ff839136af1b3b71..0c2a29f8c90b6e98f6a55c4938c42c10d97da3d2 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -70,6 +70,7 @@ submodule etsi-nfv-vnf {
list network-interface-requirements {
key "key";
min-elements "1";
+ max-elements "1";
leaf key {
type string;
@@ -1148,7 +1149,9 @@ submodule etsi-nfv-vnf {
}
}
leaf cpd {
- path "deref(../vdu-id)/../int-cpd/id";
+ type leafref {
+ path "deref(../vdu-id)/../int-cpd/id";
+ }
}
}
}