From 89c5ea04c91b206a1354a4aedf1cb7b6aa44b92a 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/ims_allin1_corpa/IMS-corpA__nsd.yaml |  3 +-
 5 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/generate_descriptor_pkg.sh b/src/generate_descriptor_pkg.sh
index cefd6239..e19085d5 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 5b016da5..4b833fed 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 cbf8ed39..f0908757 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 54c5939f..364d368e 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/ims_allin1_corpa/IMS-corpA__nsd.yaml b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
index 95e5f460..cc613b3d 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
-- 
2.25.1