From: Philip Joseph <philip.joseph@riftio.com>
Date: Wed, 28 Sep 2016 10:01:00 +0000 (+0530)
Subject: Remove second interface and network for ubuntu NS
X-Git-Tag: v2.0.2~6^2~35
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=85153905369875326ec31a8fda658c6dbcf58858;p=osm%2Fdevops.git

Remove second interface and network for ubuntu NS

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---

diff --git a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
index 0c769989..daf84bdf 100644
--- a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
+++ b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
@@ -38,21 +38,3 @@ nsd:nsd-catalog:
                     nsd:vnfd-id-ref: ubuntu_xenial_vnfd
                     # NOTE: Validate the entry below
                     nsd:vnfd-connection-point-ref: eth0
-            -   id: ubuntu_xenial_nsd_vld2
-                name: data
-                short-name: data
-                type: ELAN
-                vim-network-name: net-corp
-                # 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: ubuntu_xenial_vnfd
-                    # NOTE: Validate the entry below
-                    nsd:vnfd-connection-point-ref: eth1
diff --git a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
index c15ef1bf..908dcb0f 100644
--- a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
+++ b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
@@ -39,15 +39,7 @@ vnfd:vnfd-catalog:
                     bandwidth: '0'
                     vpci: 0000:00:0a.0
                 vnfd-connection-point-ref: eth0
-            -   name: eth1
-                virtual-interface:
-                    type: VIRTIO
-                    bandwidth: '0'
-                    vpci: 0000:00:0b.0
-                vnfd-connection-point-ref: eth1
 
         connection-point:
             -   name: eth0
                 type: VPORT
-            -   name: eth1
-                type: VPORT