From 3ecb85b224864d3b7ea70884b31df2e88041b9c3 Mon Sep 17 00:00:00 2001
From: Mahesh Jethanandani <mjethanandani@gmail.com>
Date: Wed, 12 Jun 2019 12:10:16 +0200
Subject: [PATCH] Address NFVIFA(19)000548

---
 example-data/complex-vnfd.xml | 12 ++++--------
 example-data/nfv-nsd.xml      |  1 +
 example-data/nfv-vnfd.xml     |  1 +
 example-data/nfv.xml          | 16 ++++++++--------
 src/yang/etsi-nfv-ns.yang     |  2 +-
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
index b10ec9f..39bbbaf 100644
--- a/example-data/complex-vnfd.xml
+++ b/example-data/complex-vnfd.xml
@@ -78,11 +78,11 @@
         <num-virtual-cpu>16</num-virtual-cpu>
       </virtual-cpu>
     </virtual-compute-desc>
-    <virtual-storage-descriptor>
+    <virtual-storage-desc>
       <id>root</id>
       <type-of-storage>root-storage</type-of-storage>
       <size-of-storage>10</size-of-storage>
-    </virtual-storage-descriptor>
+    </virtual-storage-desc>
     <sw-image-desc>
       <id>CP</id>
       <name>CP</name>
@@ -116,17 +116,13 @@
     <int-virtual-link-desc>
       <id>internal-vl</id>
       <connectivity-type>
-        <layer-protocol>
-          <protocol>ipv4</protocol>
-        </layer-protocol>
+        <layer-protocol>ipv4</layer-protocol>
       </connectivity-type>
     </int-virtual-link-desc>
     <int-virtual-link-desc>
       <id>mgmt</id>
       <connectivity-type>
-        <layer-protocol>
-          <protocol>ipv4</protocol>
-        </layer-protocol>
+        <layer-protocol>ipv4</layer-protocol>
       </connectivity-type>
     </int-virtual-link-desc>
     <ext-cpd>
diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml
index ba4ec2d..03423e6 100644
--- a/example-data/nfv-nsd.xml
+++ b/example-data/nfv-nsd.xml
@@ -49,6 +49,7 @@
       </checksum>
       <container-format>bare</container-format>
       <disk-format>qcow2</disk-format>
+      <min-disk>1</min-disk>
       <min-ram>2.0</min-ram>
       <size>1</size>
       <image>http://www.cisco.com/asa.qcow2</image>
diff --git a/example-data/nfv-vnfd.xml b/example-data/nfv-vnfd.xml
index 7587240..6b76c43 100644
--- a/example-data/nfv-vnfd.xml
+++ b/example-data/nfv-vnfd.xml
@@ -48,6 +48,7 @@
     </checksum>
     <container-format>bare</container-format>
     <disk-format>qcow2</disk-format>
+    <min-disk>1</min-disk>
     <min-ram>2.0</min-ram>
     <size>1</size>
     <image>http://www.cisco.com/asa.qcow2</image>
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 9273101..d599a3e 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -284,10 +284,10 @@
       </connectivity-type>
       <df>
         <id>normal</id>
-        <qos>
+        <ns-qos>
           <latency>0</latency>
           <packet-delay-variation>0</packet-delay-variation>
-        </qos>
+        </ns-qos>
       </df>
     </virtual-link-desc>
     <virtual-link-desc>
@@ -297,10 +297,10 @@
       </connectivity-type>
       <df>
         <id>normal</id>
-        <qos>
+        <ns-qos>
           <latency>0</latency>
           <packet-delay-variation>0</packet-delay-variation>
-        </qos>
+        </ns-qos>
       </df>
     </virtual-link-desc>
     <virtual-link-desc>
@@ -310,10 +310,10 @@
       </connectivity-type>
       <df>
         <id>normal</id>
-        <qos>
+        <ns-qos>
           <latency>0</latency>
           <packet-delay-variation>0</packet-delay-variation>
-        </qos>
+        </ns-qos>
       </df>
     </virtual-link-desc>
     <df>
@@ -533,10 +533,10 @@
       </connectivity-type>
       <df>
         <id>r2fw</id>
-        <qos>
+        <ns-qos>
           <latency>1000</latency>
           <packet-delay-variation>2</packet-delay-variation>
-        </qos>
+        </ns-qos>
       </df>
     </virtual-link-desc>
     <df>
diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang
index 1eb49ce..dfbab37 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
-- 
GitLab