diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index 53a50d091fe67c66880362719016299c6c6232cf..b10ec9f35eae5c54180a1a66505a10e1408db47b 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -93,6 +93,7 @@
bare
qcow2
+ 1
2.0
1
http://mycompany.images.com/control-plane.qcow2
@@ -107,6 +108,7 @@
bare
qcow2
+ 1
2.0
1
http://mycompany.images.com/data-plane.qcow2
@@ -202,6 +204,17 @@
il-1
+
+
+ true
+
+
+ 1
+
+
+ 1
+
+
control-plane
anti-affinity
@@ -262,6 +275,17 @@
il-1
+
+
+ true
+
+
+ 1
+
+
+ 1
+
+
control-plane
anti-affinity
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index a70942b2f94c14cf4cbd729f4b25fea31ca6a666..1ee310fab7325b42f6337b3de3ad7e50e3e27700 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -49,6 +49,7 @@
bare
qcow2
+ 1
2.0
1
http://mycompany.images.com/asa.qcow2
@@ -99,6 +100,17 @@
single
+
+
+ true
+
+
+ 1
+
+
+ 1
+
+
@@ -151,6 +163,7 @@
bare
qcow2
+ 1
2.0
1
http://mycompany.images.com/csr.qcow2
@@ -201,6 +214,17 @@
single
+
+
+ true
+
+
+ 1
+
+
+ 1
+
+
diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang
index 252959930eac9a9d9eee2dc6b8ccd8590815dd30..8c641a8a3772ac125113e413524b3e23510ce9ef 100644
--- a/src/yang/etsi-nfv-common.yang
+++ b/src/yang/etsi-nfv-common.yang
@@ -532,7 +532,7 @@ submodule etsi-nfv-common {
when "../type='mac-address'";
leaf mac-address-assignment {
type boolean;
- default true;
+ mandatory true;
description
"Specify if the MAC address assignment is the
responsibility of management and orchestration function
@@ -558,7 +558,7 @@ submodule etsi-nfv-common {
when "../type='ip-address'";
leaf ip-address-assignment {
type boolean;
- default "true";
+ mandatory true;
description
"Specify if the address assignment is the responsibility
of management and orchestration function or not. If it
@@ -571,7 +571,7 @@ submodule etsi-nfv-common {
leaf floating-ip-activated {
type boolean;
- default "true";
+ mandatory true;
description
"Specify if the floating IP scheme is activated on the CP
or not.";
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 9856e4c2fb659d9a5f3cd218d5e7f5cc31486aa4..483b2460c7a5a89462187be61d197046dcd08e8b 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -1345,6 +1345,7 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.3.11.2 NsProfile information
element";
}
+
leaf min-number-of-instances {
type uint16;
default 1;
diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang
index 2f39f7aed0a2048c26dfabb6f64c060842c7681a..38ab691f29d74a2a0743ce52fde76ae1c6f22f4b 100755
--- a/src/yang/etsi-nfv-vnf.yang
+++ b/src/yang/etsi-nfv-vnf.yang
@@ -545,7 +545,7 @@ submodule etsi-nfv-vnf {
range "0..max";
}
units "GB";
- default 1;
+ mandatory true;
description
"Amount of virtual memory in GB.";
reference
@@ -741,7 +741,7 @@ submodule etsi-nfv-vnf {
leaf size-of-storage {
type uint64;
units "GB";
- default 0;
+ mandatory true;
description
"Size of virtualised storage resource (e.g. size of
volume, in GB)";
@@ -959,7 +959,7 @@ submodule etsi-nfv-vnf {
leaf min-disk {
type uint64;
units "GB";
- default 0;
+ mandatory true;
description
"The minimal disk size requirement for this software
image. The value of the 'size of storage' attribute
@@ -1477,7 +1477,7 @@ submodule etsi-nfv-vnf {
enum ipv4;
enum ipv6;
}
- default "ipv4";
+ mandatory true;
description
"Specifies IP version of this L3 protocol.
Value:
@@ -1796,7 +1796,7 @@ submodule etsi-nfv-vnf {
leaf arbitrary-target-levels-supported {
type boolean;
- default "false";
+ mandatory true;
description
"Signals whether scaling according to the parameter
'scaleInfo' is supported by this VNF.";
@@ -1851,7 +1851,7 @@ submodule etsi-nfv-vnf {
leaf min-graceful-termination {
type yang:timeticks;
- default "1";
+ mandatory true;
description
"Minimum timeout value for graceful termination of
a VNF instance.";
@@ -1903,7 +1903,7 @@ submodule etsi-nfv-vnf {
leaf min-graceful-stop-timeout {
type yang:timeticks;
- default "1";
+ mandatory true;
description
"Minimum timeout value for graceful stop of a VNF
instance.";