-
-${ns_id} ${EMPTY}
-${username} ubuntu
-${password} ${EMPTY}
-${vnf_member_index} middle
-${vnf_ip_addr} ${EMPTY}
-${nst_config} {netslice-vld: [ {name: slice_vld_mgmt, vim-network-name: %{VIM_MGMT_NET}} ] }
+# NS and VNF descriptor package files
+${VNFD1_PKG} slice_basic_vnf
+${VNFD2_PKG} slice_basic_middle_vnf
+${NSD1_PKG} slice_basic_ns
+${NSD2_PKG} slice_basic_middle_ns
+${NST} slice_basic_nst/slice_basic_nst.yaml
+${NST2} slice_basic_nst/slice_basic_2nd_nst.yaml
+
+# Instance names
+${SLICE_NAME} slicebasic
+${SLICE2_NAME} sliceshared
+${MIDDLE_NS_NAME} slicebasic.slice_basic_nsd_2
+
+# Descriptor names
+${NST_NAME} slice_basic_nst
+${NST2_NAME} slice_basic_nst2
+${VNFD1_NAME} slice_basic_vnf
+${VNFD2_NAME} slice_basic_middle_vnf
+${NSD1_NAME} slice_basic_ns
+${NSD2_NAME} slice_basic_middle_ns
+
+# SSH keys and username to be used
+${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub
+${PRIVATEKEY} %{HOME}/.ssh/id_rsa
+${USERNAME} ubuntu
+${PASSWORD} ${EMPTY}
+
+${VNF_MEMBER_INDEX} middle
+${VNF_IP_ADDR} ${EMPTY}
+${NST_CONFIG} {netslice-vld: [ {name: slice_vld_mgmt, vim-network-name: %{VIM_MGMT_NET}} ] }