Bug 91 : VNF names and NS names in the descriptor packages use a confusing suffix...

[osm/devops.git] / src / nsd / ubuntu_xenial_ns / ubuntu_xenial_nsd.yaml

diff --git a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
index 0c76998..7f91d43 100644 (file)
--- a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
+++ b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
@@ -1,8 +1,8 @@
 nsd:nsd-catalog:
     nsd:
     -   id: ubuntu_xenial_nsd
-        name: ubuntu_xenial_nsd
-        short-name: ubuntu_xenial_nsd
+        name: ubuntu_xenial_ns
+        short-name: ubuntu_xenial_ns
         description: Generated by OSM pacakage generator
         vendor: OSM
         version: '1.0'
@@ -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