From 704420762b688a0765a5927a5e40728b6f9922e6 Mon Sep 17 00:00:00 2001
From: Mahesh Jethanandani <mjethanandani@gmail.com>
Date: Mon, 16 Sep 2019 11:45:37 -0700
Subject: [PATCH] Bug#251

---
 example-data/complex-vnfd.xml | 12 ++++-------
 example-data/nfv-nsd.xml      |  1 +
 example-data/nfv-vnfd.xml     |  1 +
 example-data/nfv.xml          | 39 +++++++++++++++++++++++++++++++----
 4 files changed, 41 insertions(+), 12 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..0b2f6b9 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>20</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..0fcf5b6 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>20</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..fef928e 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -54,12 +54,23 @@
       <size>1</size>
       <image>http://mycompany.images.com/asa.qcow2</image>
     </sw-image-desc>
+    <int-virtual-link-desc>
+      <id>inside-vl</id>
+      <flavour>
+	<id>1g</id>
+	<qos>
+	  <latency>1</latency>
+	  <packet-delay-variation>1</packet-delay-variation>
+	  <packet-loss-ratio>0.02</packet-loss-ratio>
+	</qos>
+      </flavour>
+      <connectivity-type>
+	<layer-protocol>ethernet</layer-protocol>
+      </connectivity-type>
+    </int-virtual-link-desc>
     <ext-cpd>
       <id>inside</id>
-      <int-cpd>
-	<vdu-id>firewall</vdu-id>
-	<cpd>inside</cpd>
-      </int-cpd>
+      <int-virtual-link-desc>inside-vl</int-virtual-link-desc>
       <layer-protocol>ethernet</layer-protocol>
     </ext-cpd>
     <ext-cpd>
@@ -85,6 +96,26 @@
         <min-number-of-instances>1</min-number-of-instances>
         <max-number-of-instances>2</max-number-of-instances>
       </vdu-profile>
+      <virtual-link-profile>
+	<id>inside-vl</id>
+	<flavour>1g</flavour>
+	<max-bit-rate-requirements>
+	  <root>10</root>
+	</max-bit-rate-requirements>
+	<min-bit-rate-requirements>
+	  <root>1</root>
+	</min-bit-rate-requirements>
+	<virtual-link-protocol-data>
+	  <associated-layer-protocol>ipv4</associated-layer-protocol>
+	  <l3-protocol-data>
+	    <name>inside-network</name>
+	    <ip-version>ipv4</ip-version>
+	    <cidr>192.138.0.0/8</cidr>
+	    <gateway-ip>192.138.0.1</gateway-ip>
+	    <dhcp-enabled>true</dhcp-enabled>
+	  </l3-protocol-data>
+	</virtual-link-protocol-data>
+      </virtual-link-profile>
       <instantiation-level>
         <id>double</id>
         <vdu-level>
-- 
GitLab