Updating slice packages

Signed-off-by: Felipe Vicens <felipe.vicens@atos.net>

slice_basic_middle_ns/slice_basic_middle_nsd.yaml

@@ -13,8 +13,8 @@
 
 nsd-catalog:
     nsd:
-    -   id: slice_basic_middle_nsd
-        name: slice_basic_middle_nsd
+    -   id: slice_basic_middle_ns
+        name: slice_basic_middle_ns
         short-name: slice_basic_middle_ns
         description: NSD to be used on Slice Testing
         vendor: OSM
@@ -22,8 +22,8 @@ nsd-catalog:
         logo: osm_2x.png
 
         constituent-vnfd:
-        -   member-vnf-index: 1
-            vnfd-id-ref: slice_basic_middle_vnfd
+        -   member-vnf-index: middle
+            vnfd-id-ref: slice_basic_middle_vnf
 
         connection-point:
         -   name: nsd_cp_mgmt
@@ -38,26 +38,26 @@ nsd-catalog:
             name: nsd_vnfd_vld_mgmt
             short-name: nsd_vnfd_vld_mgmt
             type: ELAN
-            mgmt-network: 'true'
+            mgmt-network: true
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 1
-                vnfd-id-ref: slice_basic_middle_vnfd
+            -   member-vnf-index-ref: middle
+                vnfd-id-ref: slice_basic_middle_vnf
                 vnfd-connection-point-ref: eth0
         -   id: nsd_vnfd_vld_data1
             name: nsd_vnfd_vld_data1
             short-name: nsd_vnfd_vld_data1
             type: ELAN
-            mgmt-network: 'false'
+            mgmt-network: false
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 1
-                vnfd-id-ref: slice_basic_middle_vnfd
+            -   member-vnf-index-ref: middle
+                vnfd-id-ref: slice_basic_middle_vnf
                 vnfd-connection-point-ref: eth1
         -   id: nsd_vnfd_vld_data2
             name: nsd_vnfd_vld_data2
             short-name: nsd_vnfd_vld_data2
             type: ELAN
-            mgmt-network: 'false'
+            mgmt-network: false
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 1
-                vnfd-id-ref: slice_basic_middle_vnfd
+            -   member-vnf-index-ref: middle
+                vnfd-id-ref: slice_basic_middle_vnf
                 vnfd-connection-point-ref: eth2

slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml

@@ -13,9 +13,9 @@
 
 vnfd-catalog:
     vnfd:
-    -   id: slice_basic_middle_vnfd
-        name: slice_basic_middle_vnfd
-        short-name: slice_basic_middle_vnfd
+    -   id: slice_basic_middle_vnf
+        name: slice_basic_middle_vnf
+        short-name: slice_basic_middle_vnf
         description: VNFD with 3 CPs to be used on Slice Testing
         vendor: OSM
         version: '1.0'

slice_basic_ns/slice_basic_nsd.yaml

@@ -13,8 +13,8 @@
 
 nsd-catalog:
     nsd:
-    -   id: slice_basic_nsd
-        name: slice_basic_nsd
+    -   id: slice_basic_ns
+        name: slice_basic_ns
         short-name: slice_basic_ns
         description: NSD to be used on Slice Testing
         vendor: OSM
@@ -22,8 +22,8 @@ nsd-catalog:
         logo: osm_2x.png
 
         constituent-vnfd:
-        -   member-vnf-index: "1"
-            vnfd-id-ref: slice_basic_vnfd
+        -   member-vnf-index: edge
+            vnfd-id-ref: slice_basic_vnf
 
         connection-point:
         -   name: nsd_cp_mgmt
@@ -38,8 +38,8 @@ nsd-catalog:
             type: ELAN
             mgmt-network: true
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: "1"
-                vnfd-id-ref: slice_basic_vnfd
+            -   member-vnf-index-ref: edge
+                vnfd-id-ref: slice_basic_vnf
                 vnfd-connection-point-ref: eth0
         -   id: nsd_vnfd_vld_data
             name: nsd_vnfd_vld_data
@@ -47,6 +47,6 @@ nsd-catalog:
             type: ELAN
             mgmt-network: false
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: "1"
-                vnfd-id-ref: slice_basic_vnfd
+            -   member-vnf-index-ref: edge
+                vnfd-id-ref: slice_basic_vnf
                 vnfd-connection-point-ref: eth1

slice_basic_nst/slice_basic_2nd_nst.yaml

@@ -25,11 +25,11 @@ nst:
     -   id: slice_basic_nsd_2
         is-shared-nss: true
         description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
-        nsd-ref: slice_basic_middle_nsd
+        nsd-ref: slice_basic_middle_ns
     -   id: slice_basic_nsd_3
         is-shared-nss: false
         description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
-        nsd-ref: slice_basic_nsd
+        nsd-ref: slice_basic_ns
 
     netslice-vld:
     -   id: slice_vld_mgmt

slice_basic_nst/slice_basic_nst.yaml

@@ -25,15 +25,15 @@ nst:
     -   id: slice_basic_nsd_1
         is-shared-nss: false
         description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
-        nsd-ref: slice_basic_nsd
+        nsd-ref: slice_basic_ns
     -   id: slice_basic_nsd_2
         is-shared-nss: true
         description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
-        nsd-ref: slice_basic_middle_nsd
+        nsd-ref: slice_basic_middle_ns
     -   id: slice_basic_nsd_3
         is-shared-nss: false
         description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
-        nsd-ref: slice_basic_nsd
+        nsd-ref: slice_basic_ns
 
     netslice-vld:
     -   id: slice_vld_mgmt

slice_basic_vnf/slice_basic_vnfd.yaml

@@ -13,9 +13,9 @@
 
 vnfd-catalog:
     vnfd:
-    -   id: slice_basic_vnfd
-        name: slice_basic_vnfd
-        short-name: slice_basic_vnfd
+    -   id: slice_basic_vnf
+        name: slice_basic_vnf
+        short-name: slice_basic_vnf
         description: VNFD with 2 CPs to be used on Slice Testing
         vendor: OSM
         version: '1.0'
@@ -31,7 +31,7 @@ vnfd-catalog:
             description: ubuntu_slice-VM
             count: 1
             cloud-init-file: cloud-config.txt
-            
+
             # Flavour of the VM to be instantiated for the VDU
             # flavor below can fit into m1.micro
             vm-flavor: