using proper names for VNFs in NSD

magma/README.md

@@ -40,11 +40,11 @@ There is a "build_infra.sh" with some examples of what needs to be prepared.
 
 ### eNodeB register Day-2
 
-`osm ns-action magma_slice.slice_hackfest_nsd_epc --vnf_name 1 --vdu_id srsLTE-vdu --action_name register --params '{mme-addr: "192.168.100.254", gtp-bind-addr: "192.168.100.10", s1c-bind-addr: "192.168.100.10"}'`
+`osm ns-action magma_slice.slice_hackfest_nsd_epc --vnf_name MagmaAGW+srsLTE --vdu_id srsLTE-vdu --action_name register --params '{mme-addr: "192.168.100.254", gtp-bind-addr: "192.168.100.10", s1c-bind-addr: "192.168.100.10"}'`
 
 ### UE attach Day-2
 
-`osm ns-action magma_slice.slice_hackfest_nsd_epc --vnf_name 1 --vdu_id srsLTE-vdu --action_name attach-ue --params '{usim-imsi: "722070000000008", usim-k: "c8eba87c1074edd06885cb0486718341", usim-opc: "17b6c0157895bcaa1efc1cef55033f5f"}'`
+`osm ns-action magma_slice.slice_hackfest_nsd_epc --vnf_name MagmaAGW+srsLTE --vdu_id srsLTE-vdu --action_name attach-ue --params '{usim-imsi: "722070000000008", usim-k: "c8eba87c1074edd06885cb0486718341", usim-opc: "17b6c0157895bcaa1efc1cef55033f5f"}'`
 
 ## Testing traffic
 
@@ -64,7 +64,7 @@ set interfaces ethernet eth1 firewall in name MAGMA_FW
 
 With this, a Day-2 primitive can be executed against the PNF to allow traffic from the specific Magma SGI IP address, for example, if it's 192.168.239.10:
 
-`osm ns-action magma_slice.slice_hackfest_nsd_epc --vnf_name 2 --action_name configure-remote --params '{magmaIP: "192.168.239.10"}'`
+`osm ns-action magma_slice.slice_hackfest_nsd_epc --vnf_name VYOS-PNF --action_name configure-remote --params '{magmaIP: "192.168.239.10"}'`
 
 With this, the UE machine will have access to Internet through the AGW and then the VyOS PNF.
 

magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml

@@ -7,9 +7,9 @@ nsd-catalog:
         vendor: Whitestack
         version: '1.0'
         constituent-vnfd:
-        -   member-vnf-index: '1'
+        -   member-vnf-index: 'MagmaAGW+srsLTE'
             vnfd-id-ref: hackfest_magma-agw-enb_vnfd
-        -   member-vnf-index: '2'
+        -   member-vnf-index: 'VYOS-PNF'
             vnfd-id-ref: hackfest_gateway_vnfd
         connection-point:
         -   name: nsd_cp_mgmt
@@ -23,13 +23,13 @@ nsd-catalog:
             type: ELAN
             mgmt-network: true
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
+            -   member-vnf-index-ref: 'MagmaAGW+srsLTE'
                 vnfd-id-ref: hackfest_magma-agw-enb_vnfd
                 vnfd-connection-point-ref: agw-mgmt
-            -   member-vnf-index-ref: '1'
+            -   member-vnf-index-ref: 'MagmaAGW+srsLTE'
                 vnfd-id-ref: hackfest_magma-agw-enb_vnfd
                 vnfd-connection-point-ref: srsLTE-mgmt
-            -   member-vnf-index-ref: '2'
+            -   member-vnf-index-ref: 'VYOS-PNF'
                 vnfd-id-ref: hackfest_gateway_vnfd
                 vnfd-connection-point-ref: gateway_public
         -   id: sgi
@@ -39,9 +39,9 @@ nsd-catalog:
             mgmt-network: false
             vim-network-name: sgi
             vnfd-connection-point-ref:
-            -   member-vnf-index-ref: '1'
+            -   member-vnf-index-ref: 'MagmaAGW+srsLTE'
                 vnfd-id-ref: hackfest_magma-agw-enb_vnfd
                 vnfd-connection-point-ref: agw-sgi
-            -   member-vnf-index-ref: '2'
+            -   member-vnf-index-ref: 'VYOS-PNF'
                 vnfd-id-ref: hackfest_gateway_vnfd
                 vnfd-connection-point-ref: gateway_public