diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index b10ec9f35eae5c54180a1a66505a10e1408db47b..39bbbaf03bed0b92b9fa98710adcc78be70afd2c 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -78,11 +78,11 @@
16
-
+
root
root-storage
10
-
+
CP
CP
@@ -116,17 +116,13 @@
internal-vl
-
- ipv4
-
+ ipv4
mgmt
-
- ipv4
-
+ ipv4
diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml
index ba4ec2d7b634784082a719200016af7c15ecdefa..03423e679e4915da8a7be7fccd2b929935b0e3cf 100644
--- a/example-data/nfv-nsd.xml
+++ b/example-data/nfv-nsd.xml
@@ -49,6 +49,7 @@
bare
qcow2
+ 1
2.0
1
http://www.cisco.com/asa.qcow2
diff --git a/example-data/nfv-vnfd.xml b/example-data/nfv-vnfd.xml
index 7587240efcd281a762527e1b7fa1e6a49049ee9e..6b76c43495c7e6490901dfaeaa4cdc59733d4a26 100644
--- a/example-data/nfv-vnfd.xml
+++ b/example-data/nfv-vnfd.xml
@@ -48,6 +48,7 @@
bare
qcow2
+ 1
2.0
1
http://www.cisco.com/asa.qcow2
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 92731014a95ae724ed26a40eb703cf7928f157c3..d599a3ebd322574f7ab007a1284328e936878456 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -284,10 +284,10 @@
normal
-
+
0
0
-
+
@@ -297,10 +297,10 @@
normal
-
+
0
0
-
+
@@ -310,10 +310,10 @@
normal
-
+
0
0
-
+
@@ -533,10 +533,10 @@
r2fw
-
+
1000
2
-
+
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 1eb49ce02f133723d16093debe9c6aef98d1397a..dfbab3799be1aa95dbe10de9e93a5bdddbf7d52f 100644
--- a/src/yang/etsi-nfv-ns.yang
+++ b/src/yang/etsi-nfv-ns.yang
@@ -253,7 +253,7 @@ submodule etsi-nfv-ns {
information element";
}
- container qos {
+ container ns-qos {
presence "VL QoS parameters";
description
"The QoS information element specifies quality of