This change updates all the references to VNF member identifiers
that were previously used in the packages. Instead of 1 and 2, they
have now a meaningful name, and the tests need to be updated because
of that.
Change-Id: I7cff4cc0f9b16c1c85aa91b49294c3977e2bebda
Signed-off-by: aguilard <e.dah.tid@telefonica.com>
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
20 files changed:
# NS instance name and configuration
${ns_name} basic_05_instantiation_params_cloud_init
# NS instance name and configuration
${ns_name} basic_05_instantiation_params_cloud_init
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ { member-vnf-index: "${vnf_member_index}", additionalParams: { password: "${new_password}" } } ] }
# SSH user and password
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ { member-vnf-index: "${vnf_member_index}", additionalParams: { password: "${new_password}" } } ] }
# SSH user and password
${password} ${EMPTY}
${action_name} touch
${password} ${EMPTY}
${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${vnf_member_index_1} vnf1
+${vnf_member_index_2} vnf2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${password} osm4u
${action_name} touch
${password} osm4u
${action_name} touch
+${vnf_member_index} vnf1
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name} /home/ubuntu/mytouch1
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name} /home/ubuntu/mytouch1
${ns_name} basic_09_manual_scaling_test
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
${scaling_group} vdu_autoscale
${ns_name} basic_09_manual_scaling_test
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
${scaling_group} vdu_autoscale
# SSH public key file
${publickey} %{HOME}/.ssh/id_rsa.pub
# SSH public key file
${publickey} %{HOME}/.ssh/id_rsa.pub
${password} ${EMPTY}
${action_name} touch
${password} ${EMPTY}
${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${vnf_member_index_1} vnf1
+${vnf_member_index_2} vnf2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${password} ${EMPTY}
${action_name} touch
${password} ${EMPTY}
${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${vnf_member_index_1} vnf1
+${vnf_member_index_2} vnf2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${max_instances} 5
${delta_instances} 2
${scaling_group} vdu_autoscale
${max_instances} 5
${delta_instances} 2
${scaling_group} vdu_autoscale
${username} ubuntu
# VNFs data
${username} ubuntu
# VNFs data
+${vnf_member_index_1} vnf
${internal_prefix} ^192.168.200.*
${success_return_code} 0
${internal_prefix} ^192.168.200.*
${success_return_code} 0
# NS instance name and configuration
${ns_name} basic_20_manual_vdu_scaling_test
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
# NS instance name and configuration
${ns_name} basic_20_manual_vdu_scaling_test
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
# SSH public key file
${publickey} %{HOME}/.ssh/id_rsa.pub
# SSH public key file
${publickey} %{HOME}/.ssh/id_rsa.pub
${privatekey} %{HOME}/.ssh/id_rsa
${username} ubuntu
${password} osm4u
${privatekey} %{HOME}/.ssh/id_rsa
${username} ubuntu
${password} osm4u
${datanet_ip1} 192.168.100.11\r
${datanet_ip2} 192.168.100.22\r
\r
${datanet_ip1} 192.168.100.11\r
${datanet_ip2} 192.168.100.22\r
\r
-${vnf_member_index_1} 1\r
-${vnf_member_index_2} 2\r
+${vnf_member_index_1} vnf1\r
+${vnf_member_index_2} vnf2\r
${username} ubuntu\r
${password} osm4u\r
${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}"}]} ] }\r
${username} ubuntu\r
${password} osm4u\r
${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}"}]} ] }\r
${datanet_ip1} 192.168.110.11
${datanet_ip2} 192.168.110.22
${datanet_ip1} 192.168.110.11
${datanet_ip2} 192.168.110.22
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${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: "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}"}]} ] }
${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}"}]} ] }
${password} ${EMPTY}
${ns_id} ${EMPTY}
${password} ${EMPTY}
${ns_id} ${EMPTY}
${password} osm4u
${ns_id} ${EMPTY}
${password} osm4u
${ns_id} ${EMPTY}
+${vnf_member_index} vnf1
${password} ${EMPTY}
${ns_id} ${EMPTY}
${password} ${EMPTY}
${ns_id} ${EMPTY}
+${vnf_member_index} vnf1
${vnf_ip_addr} ${EMPTY}
${wait_guard_for_vm_boot} 50s
${vnf_ip_addr} ${EMPTY}
${wait_guard_for_vm_boot} 50s
${password} ${EMPTY}
${action_name} touch
${password} ${EMPTY}
${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${vnf_member_index_1} vnf1
+${vnf_member_index_2} vnf2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${password} ${EMPTY}
${action_name} touch
${password} ${EMPTY}
${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${vnf_member_index_1} vnf1
+${vnf_member_index_2} vnf2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${password} ${EMPTY}
${action_name} touch
${password} ${EMPTY}
${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
+${vnf_member_index_1} vnf1
+${vnf_member_index_2} vnf2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${day_1_file_name} /home/ubuntu/first-touch
${day_2_file_name_1} /home/ubuntu/mytouch1
${day_2_file_name_2} /home/ubuntu/mytouch2
${ns_id} ${EMPTY}
${username} ubuntu
${password} osm4u
${ns_id} ${EMPTY}
${username} ubuntu
${password} osm4u
${vnf_ip_addr} ${EMPTY}
${vnf_id} ${EMPTY}
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
${vnf_ip_addr} ${EMPTY}
${vnf_id} ${EMPTY}
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
${ws_ns_id} ${EMPTY}
${username} ubuntu
${password} ${EMPTY}
${ws_ns_id} ${EMPTY}
${username} ubuntu
${password} ${EMPTY}
${ws_vnf_ip_addr} ${EMPTY}
${success_return_code} 0
${alarm_msg} notify_alarm
${ws_vnf_ip_addr} ${EMPTY}
${success_return_code} 0
${alarm_msg} notify_alarm