-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
-${username} ubuntu
-${password} osm4u
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} , {name: datanet, ip-profile: {ip-version: ipv4, subnet-address: "${datanet_subnet}"}, vnfd-connection-point-ref: [ {member-vnf-index-ref: "1", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip1}"}, {member-vnf-index-ref: "2", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip2}"}]} ] }
-${success_return_code} 0
+# NS and VNF descriptor package folder and ids
+${VNFD_PKG} epa_1vm_passthrough_vnf
+${VNFD_NAME} epa_1vm_passthrough-vnf
+${NSD_PKG} epa_1vm_passthrough_ns
+${NSD_NAME} epa_1vm_passthrough-ns
+${NS_NAME} epa_05
+
+# Fixed IPs and subnet for datanet VL
+${DATANET_SUBNET} 192.168.110.0/24
+${DATANET_IP1} 192.168.110.11
+${DATANET_IP2} 192.168.110.22
+
+${VNF_MEMBER_INDEX_1} vnf1
+${VNF_MEMBER_INDEX_2} vnf2
+${USERNAME} ubuntu
+${PASSWORD} osm4u
+${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} , {name: datanet, ip-profile: {ip-version: ipv4, subnet-address: "${DATANET_SUBNET}"}, vnfd-connection-point-ref: [ {member-vnf-index-ref: "${VNF_MEMBER_INDEX_1}", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${DATANET_IP1}"}, {member-vnf-index-ref: "${VNF_MEMBER_INDEX_2}", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${DATANET_IP2}"}]} ] }
+${SUCCESS_RETURN_CODE} 0