From daa928596a8adbb15f2820e59cf864dae4c6b540 Mon Sep 17 00:00:00 2001
From: Philip Joseph <philip.joseph@riftio.com>
Date: Wed, 28 Sep 2016 00:35:59 +0530
Subject: [PATCH] Update descriptors to use vim-network-name

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---
 src/generate_descriptor_pkg.sh               | 45 +++++++++++++++++---
 src/nsd/VyOS_ns/VyOS_nsd.yaml                |  3 +-
 src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml  |  2 +-
 src/nsd/cirros_ns/cirros_nsd.yaml            |  2 +-
 src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml        | 12 +++---
 src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml |  3 +-
 src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml     |  8 ++--
 src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml       | 11 ++---
 8 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/src/generate_descriptor_pkg.sh b/src/generate_descriptor_pkg.sh
index cefd623..e19085d 100755
--- a/src/generate_descriptor_pkg.sh
+++ b/src/generate_descriptor_pkg.sh
@@ -65,7 +65,7 @@ INTF_TYPE='VIRTIO'
 VCPU=2
 MEMORY=4096
 STORAGE=10
-INTERFACES=1
+INTERFACES=2
 
 function usage() {
     cat <<EOF
@@ -98,7 +98,7 @@ Usage:
 
             --vendor : Vendor name for descriptor. Default OSM
 
-            --interface-type : Interface type [VIRTIO|SR-IOV|PCI-PASSTHROUGH|E1000|OM-MGMT]
+            --interface-type : Interface type [VIRTIO|SR-IOV|PCI-PASSTHROUGH|E1000]
                                Default VIRTIO
 
           VM Flavour options:
@@ -118,7 +118,7 @@ Usage:
             --cloud-init : Cloud init script. Will be ignored if
                            cloud-init-file is specified
 
-            --interfaces : Number of external interfaces. Default 1.
+            --interfaces : Number of external interfaces. Default 2.
 
         End of create descriptor specific options
 
@@ -211,8 +211,18 @@ EOF
             # There can be multiple interfaces defined
 EOF
 
+    # Add mgmt interface
+    cat >>$desc_file <<EOF
+            -   name: eth0
+                virtual-interface:
+                    type: OM-MGMT
+                    bandwidth: '0'
+                    vpci: 0000:00:0a.0
+                vnfd-connection-point-ref: eth0
+EOF
+
     # Add external interfaces
-    for i in `seq 1 ${INTERFACES}`; do
+    for i in `seq 2 ${INTERFACES}`; do
         eth=$(($i - 1))
         pci=$(get_pci $eth)
         cat >>$desc_file <<EOF
@@ -277,15 +287,38 @@ EOF
         # Networks for the VNFs
 EOF
 
-    for i in `seq 1 ${INTERFACES}`; do
+    # Add management VLD
+    cat >>$desc_file <<EOF
+            -   id: ${name}_vld${i}
+                name: management
+                short-name: management
+                type: ELAN
+                # vim-network-name: <update>
+                # provider-network:
+                #     overlay-type: VLAN
+                #     segmentation_id: <update>
+                vnfd-connection-point-ref:
+                # Specify the constituent VNFs
+                # member-vnf-index-ref - entry from constituent vnf
+                # vnfd-id-ref - VNFD id
+                # vnfd-connection-point-ref - connection point name in the VNFD
+                -   nsd:member-vnf-index-ref: 1
+                    nsd:vnfd-id-ref: ${vnfd}
+                    # NOTE: Validate the entry below
+                    nsd:vnfd-connection-point-ref: eth0
+EOF
+
+    # Add rest of VLDs
+    for i in `seq 2 ${INTERFACES}`; do
         eth=$(($i - 1))
         cat >>$desc_file <<EOF
             -   id: ${name}_vld${i}
                 name: ${name}_vld${i}
+                short-name: ${name}_vld${i}
                 type: ELAN
+                # vim-network-name: <update>
                 # provider-network:
                 #     overlay-type: VLAN
-                #     physical-network: <update>
                 #     segmentation_id: <update>
                 vnfd-connection-point-ref:
                 # Specify the constituent VNFs
diff --git a/src/nsd/VyOS_ns/VyOS_nsd.yaml b/src/nsd/VyOS_ns/VyOS_nsd.yaml
index 5b016da..4b833fe 100644
--- a/src/nsd/VyOS_ns/VyOS_nsd.yaml
+++ b/src/nsd/VyOS_ns/VyOS_nsd.yaml
@@ -13,6 +13,7 @@ nsd:nsd-catalog:
             name: data
             short-name: data
             type: ELAN
+            vim-network-name: net-corp
             provider-network:
                 overlay-type: VLAN
             vnfd-connection-point-ref:
@@ -23,9 +24,9 @@ nsd:nsd-catalog:
             name: management
             short-name: management
             type: ELAN
+            vim-network-name: net-mgmtOS
             provider-network:
                 overlay-type: VLAN
-                physical-network: net-mgmtOS
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: eth0
diff --git a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
index cbf8ed3..f090875 100644
--- a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
+++ b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
@@ -27,9 +27,9 @@ nsd:nsd-catalog:
                 name: cirros_2vnf_nsd_vld1
                 short-name: cirros_2vnf_nsd_vld1
                 type: ELAN
+                # vim-network-name: <update>
                 # provider-network:
                 #     overlay-type: VLAN
-                #     physical-network: <update>
                 #     segmentation_id: <update>
                 vnfd-connection-point-ref:
                 # Specify the constituent VNFs
diff --git a/src/nsd/cirros_ns/cirros_nsd.yaml b/src/nsd/cirros_ns/cirros_nsd.yaml
index 54c5939..364d368 100644
--- a/src/nsd/cirros_ns/cirros_nsd.yaml
+++ b/src/nsd/cirros_ns/cirros_nsd.yaml
@@ -23,9 +23,9 @@ nsd:nsd-catalog:
             -   id: cirros_nsd_vld1
                 name: cirros_nsd_vld1
                 type: ELAN
+                # vim-network-name: <update>
                 # provider-network:
                 #     overlay-type: VLAN
-                #     physical-network: <update>
                 #     segmentation_id: <update>
                 vnfd-connection-point-ref:
                 # Specify the constituent VNFs
diff --git a/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml b/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml
index eb8a325..8835555 100644
--- a/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml
+++ b/src/nsd/gw_corpa_ns/gwcorpA__nsd.yaml
@@ -14,10 +14,10 @@ nsd:nsd-catalog:
         -   id: connection_0
             name: connection_0
             short-name: connection_0
+            vim-network-name: mgmt
             type: ELAN
             provider-network:
                 overlay-type: VLAN
-                physical-network: mgmt
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: eth1
@@ -26,9 +26,9 @@ nsd:nsd-catalog:
             name: connection_1
             short-name: connection_1
             type: ELAN
+            vim-network-name: mgmt
             provider-network:
                 overlay-type: VLAN
-                physical-network: mgmt
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: eth1
@@ -37,9 +37,9 @@ nsd:nsd-catalog:
             name: connection_2
             short-name: connection_2
             type: ELAN
+            vim-network-name: mwc1
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc1
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: eth0
@@ -48,9 +48,9 @@ nsd:nsd-catalog:
             name: connection_3
             short-name: connection_3
             type: ELAN
+            vim-network-name: mwc2
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc2
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: eth0
@@ -59,9 +59,9 @@ nsd:nsd-catalog:
             name: connection_4
             short-name: connection_4
             type: ELAN
+            vim-network-name: mwc16data1
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc16data1
                 segmentation_id: '101'
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
@@ -71,9 +71,9 @@ nsd:nsd-catalog:
             name: connection_5
             short-name: connection_5
             type: ELAN
+            vim-network-name: mwc16data2
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc16data2
                 segmentation_id: '102'
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
diff --git a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
index 95e5f46..cc613b3 100644
--- a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
+++ b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
@@ -13,6 +13,7 @@ nsd:nsd-catalog:
             name: data
             short-name: data
             type: ELAN
+            vim-network-name: net-corp:108
             provider-network:
                 overlay-type: VLAN
                 physical-network: net-corp
@@ -25,9 +26,9 @@ nsd:nsd-catalog:
             name: management
             short-name: management
             type: ELAN
+            vim-network-name: net-mgmtOS
             provider-network:
                 overlay-type: VLAN
-                physical-network: net-mgmtOS
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: eth1
diff --git a/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml b/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml
index 9e6f887..454a444 100644
--- a/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml
+++ b/src/nsd/mwc16_gen_ns/mwc16-gen__nsd.yaml
@@ -13,9 +13,9 @@ nsd:nsd-catalog:
             name: connection 0
             short-name: connection 0
             type: ELAN
+            vim-network-name: mwc
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: eth0
@@ -24,9 +24,9 @@ nsd:nsd-catalog:
             name: connection 1
             short-name: connection 1
             type: ELAN
+            vim-network-name: mgmt
             provider-network:
                 overlay-type: VLAN
-                physical-network: mgmt
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: eth1
@@ -35,9 +35,9 @@ nsd:nsd-catalog:
             name: connection 2
             short-name: connection 2
             type: ELAN
+            vim-network-name: mwc16data1
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc16data1
                 segmentation_id: '3000'
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
@@ -47,9 +47,9 @@ nsd:nsd-catalog:
             name: connection 3
             short-name: connection 3
             type: ELAN
+            vim-network-name: mwc16data2
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc16data2
                 segmentation_id: '3000'
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
diff --git a/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml b/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml
index 5918cb2..a70cea8 100644
--- a/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml
+++ b/src/nsd/mwc16_pe_ns/mwc16-pe__nsd.yaml
@@ -17,20 +17,20 @@ nsd:nsd-catalog:
             name: 6WindTR1.1.2__3 to OpenStack
             short-name: 6WindTR1.1.2__3 to OpenStack
             type: ELAN
+            vim-network-name: interDC
             provider-network:
                 overlay-type: VLAN
-                physical-network: interDC
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '3'
                 vnfd-connection-point-ref: xe3
                 vnfd-id-ref: 6WindTR1.1.2
         -   id: 6WindTR1.1.2__1 enty point
             name: 6WindTR1.1.2__1 enty point
-            short-name: 6WindTR1.1.2__1 enty point
+            short-name: 6WindTR1.1.2__1 entry point
             type: ELAN
+            vim-network-name: mwc16data1
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc16data1
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: xe2
@@ -39,9 +39,9 @@ nsd:nsd-catalog:
             name: 6WindTR1.1.2__2 entry point
             short-name: 6WindTR1.1.2__2 entry point
             type: ELAN
+            vim-network-name: mwc16data2
             provider-network:
                 overlay-type: VLAN
-                physical-network: mwc16data2
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '2'
                 vnfd-connection-point-ref: xe2
@@ -49,9 +49,9 @@ nsd:nsd-catalog:
         -   id: management
             name: management
             short-name: management
+            vim-network-name: mgmt
             provider-network:
                 overlay-type: VLAN
-                physical-network: mgmt
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
@@ -76,6 +76,7 @@ nsd:nsd-catalog:
                 vnfd-id-ref: 6WindTR1.1.2
         -   id: 6WindTR1.1.2__1-6WindTR1.1.2__3
             name: 6WindTR1.1.2__1-6WindTR1.1.2__3
+            short-name: 6WindTR1.1.2__1-6WindTR1.1.2__3
             type: ELAN
             vnfd-connection-point-ref:
             -   member-vnf-index-ref: '1'
-- 
2.25.1