Updated VNF member identifier

This commit reqires https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages/-/merge_requests/187 packages to be merged.

Change-Id: I7cff4cc0f9b16c1c85aa91b49294c3977e2bebda
Signed-off-by: aguilard <e.dah.tid@telefonica.com>

diff --git a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
index 75c911c..3175a86 100644 (file)
--- a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
+++ b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
@@ -35,7 +35,7 @@ ${nsd_name}   ubuntu_cloudinit-ns
 
 # NS instance name and configuration
 ${ns_name}   basic_05_instantiation_params_cloud_init
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${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

diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
index 704f04f..2d9f1a6 100644 (file)
--- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot
+++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
@@ -44,8 +44,8 @@ ${username}   ubuntu
 ${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

diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot
index 1b01f78..699b0e7 100644 (file)
--- a/robot-systest/testsuite/basic_07-secure_key_management.robot
+++ b/robot-systest/testsuite/basic_07-secure_key_management.robot
@@ -43,7 +43,7 @@ ${username}   ubuntu
 ${password}   osm4u
 
 ${action_name}   touch
-${vnf_member_index}   1
+${vnf_member_index}   vnf1
 ${day_1_file_name}   /home/ubuntu/first-touch
 ${day_2_file_name}   /home/ubuntu/mytouch1
 

diff --git a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
index edb1559..fe99726 100644 (file)
--- a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
+++ b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
@@ -38,7 +38,7 @@ ${nsd_name}   hackfest_basic-ns-metrics
 ${ns_name}   basic_09_manual_scaling_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${scaling_group}   vdu_autoscale
-${vnf_member_index}  1
+${vnf_member_index}  vnf
 
 # SSH public key file
 ${publickey}   %{HOME}/.ssh/id_rsa.pub

diff --git a/robot-systest/testsuite/basic_11-native_charms.robot b/robot-systest/testsuite/basic_11-native_charms.robot
index be3af67..37f0581 100644 (file)
--- a/robot-systest/testsuite/basic_11-native_charms.robot
+++ b/robot-systest/testsuite/basic_11-native_charms.robot
@@ -45,8 +45,8 @@ ${username}   ubuntu
 ${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

diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot
index fe0fe97..eb8b352 100644 (file)
--- a/robot-systest/testsuite/basic_13-ns_relations.robot
+++ b/robot-systest/testsuite/basic_13-ns_relations.robot
@@ -47,8 +47,8 @@ ${username}   ubuntu
 ${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

diff --git a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
index 52d8069..af8ec1c 100644 (file)
--- a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
+++ b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
@@ -47,7 +47,7 @@ ${min_instances}   3
 ${max_instances}   5
 ${delta_instances}   2
 ${scaling_group}   vdu_autoscale
-${vnf_member_index}  1
+${vnf_member_index}  vnf
 
 
 *** Test Cases ***

diff --git a/robot-systest/testsuite/basic_19-vnf_ip_profile.robot b/robot-systest/testsuite/basic_19-vnf_ip_profile.robot
index b655ce5..8c9d1d3 100644 (file)
--- a/robot-systest/testsuite/basic_19-vnf_ip_profile.robot
+++ b/robot-systest/testsuite/basic_19-vnf_ip_profile.robot
@@ -44,7 +44,7 @@ ${publickey}   %{HOME}/.ssh/id_rsa.pub
 ${username}   ubuntu
 
 # VNFs data
-${vnf_member_index_1}   1
+${vnf_member_index_1}   vnf
 ${internal_prefix}   ^192.168.200.*
 
 ${success_return_code}   0

diff --git a/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot b/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot
index 6ac3a9b..d23b280 100644 (file)
--- a/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot
+++ b/robot-systest/testsuite/basic_20-manual_native_charm_vdu_scaling.robot
@@ -37,7 +37,7 @@ ${nsd_name}   native_manual_scale_charm-ns
 # NS instance name and configuration
 ${ns_name}   basic_20_manual_vdu_scaling_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${vnf_member_index}  1
+${vnf_member_index}  vnf
 
 # SSH public key file
 ${publickey}   %{HOME}/.ssh/id_rsa.pub

diff --git a/robot-systest/testsuite/epa_01-epa_sriov.robot b/robot-systest/testsuite/epa_01-epa_sriov.robot
index 8e89641..8afcb77 100644 (file)
--- a/robot-systest/testsuite/epa_01-epa_sriov.robot
+++ b/robot-systest/testsuite/epa_01-epa_sriov.robot
@@ -45,7 +45,7 @@ ${publickey}   %{HOME}/.ssh/id_rsa.pub
 ${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   osm4u
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
 
 

diff --git a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
index bb2d521..d0ca379 100644 (file)
--- a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
+++ b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
@@ -43,8 +43,8 @@ ${datanet_subnet}   192.168.100.0/24
 ${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

diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
index 6ea9e8c..d0ed8ca 100644 (file)
--- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
+++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
@@ -43,8 +43,8 @@ ${datanet_subnet}   192.168.110.0/24
 ${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}"}]} ] }

diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot
index 5dfacae..1996d81 100644 (file)
--- a/robot-systest/testsuite/hackfest_basic.robot
+++ b/robot-systest/testsuite/hackfest_basic.robot
@@ -48,7 +48,7 @@ ${username}   ubuntu
 ${password}   ${EMPTY}
 
 ${ns_id}   ${EMPTY}
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
 
 

diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot
index 389dea7..87df100 100644 (file)
--- a/robot-systest/testsuite/hackfest_cloudinit.robot
+++ b/robot-systest/testsuite/hackfest_cloudinit.robot
@@ -46,7 +46,7 @@ ${username}   ubuntu
 ${password}   osm4u
 
 ${ns_id}   ${EMPTY}
-${vnf_member_index}   1
+${vnf_member_index}   vnf1
 ${vnf_ip_addr}   ${EMPTY}
 
 

diff --git a/robot-systest/testsuite/hackfest_multivdu.robot b/robot-systest/testsuite/hackfest_multivdu.robot
index c6bc06a..0005609 100644 (file)
--- a/robot-systest/testsuite/hackfest_multivdu.robot
+++ b/robot-systest/testsuite/hackfest_multivdu.robot
@@ -48,7 +48,7 @@ ${username}   ubuntu
 ${password}   ${EMPTY}
 
 ${ns_id}   ${EMPTY}
-${vnf_member_index}   1
+${vnf_member_index}   vnf1
 ${vnf_ip_addr}   ${EMPTY}
 ${wait_guard_for_vm_boot}   50s
 

diff --git a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
index 5ea838a..b10098f 100644 (file)
--- a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
+++ b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
@@ -45,8 +45,8 @@ ${username}   ubuntu
 ${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

diff --git a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
index f1a6d87..6b8d3cf 100644 (file)
--- a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
+++ b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
@@ -45,8 +45,8 @@ ${username}   ubuntu
 ${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

diff --git a/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
index 4718eb1..68d5cce 100644 (file)
--- a/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
+++ b/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
@@ -45,8 +45,8 @@ ${username}   ubuntu
 ${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

diff --git a/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot b/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
index e500cb7..e769f55 100644 (file)
--- a/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
+++ b/robot-systest/testsuite/sa_02-vnf_with_vim_metrics_and_autoscaling.robot
@@ -35,7 +35,7 @@ Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 ${ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   osm4u
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
 ${vnf_id}   ${EMPTY}
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }

diff --git a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
index bdf20bd..6323817 100644 (file)
--- a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
+++ b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
@@ -36,7 +36,7 @@ ${ns_id}   ${EMPTY}
 ${ws_ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   ${EMPTY}
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${ws_vnf_ip_addr}   ${EMPTY}
 ${success_return_code}   0
 ${alarm_msg}   notify_alarm