Fix basic26 credentials to connect to OSM via SSH

Change-Id: I1da6be6be34b6011ef3e3fc1d05882534a36e623
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot b/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot
index 952de04..b4c8d81 100644 (file)
--- a/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot
+++ b/robot-systest/testsuite/basic_26-secure_helm_execution_environment.robot
@@ -36,21 +36,26 @@ ${nsd_name}   simple_ee-ns
 # NS instance name and configuration
 ${ns_name}   basic_26_secure_helm_ee_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_timeout}   5min
 
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{OSM_RSA_FILE}
+# SSH keys and username to be used to connect to the VNF
 ${username}   ubuntu
 ${password}   ${EMPTY}
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{OSM_RSA_FILE}
+
+# SSH keys and username to be used to connect to OSM VM
+${osm_host}   %{OSM_HOSTNAME}
+${osm_username}   ubuntu
+${osm_password}   ${EMPTY}
+${osm_privatekey}   %{OSM_RSA_FILE}
 
+# Variables related to day1 and day2
 ${action_name}   touch
 ${new_action_name}   mkdir
 ${vnf_member_index}   simple
 ${day_1_file_name}   /home/ubuntu/first-touch
-${ns_timeout}   15min
 
-${host}   %{OSM_HOSTNAME}
-${username}   ubuntu
 
 *** Test Cases ***
 Create VNF Descriptor
@@ -92,10 +97,10 @@ Check Remote File Created Via Day 1 Operation
 
 Get data from EE pod
 
-    Open Connection   ${host}
-    Login With Public Key   ${username}   keyfile=${privatekey}
-    ${pod}=   Execute Remote Command Check Rc Return Output   ${host}   ${username}   ${password}   ${privatekey}   kubectl get pod -n ${ns_id} --no-headers -o custom-columns=":metadata.name"
-    ${svc}=   Execute Remote Command Check Rc Return Output   ${host}   ${username}   ${password}   ${privatekey}   kubectl get svc -n ${ns_id} -l app.kubernetes.io/name=eechart -o jsonpath='{.items[0].spec.clusterIP}'
+    Open Connection   ${osm_host}
+    Login With Public Key   ${osm_username}   keyfile=${osm_privatekey}
+    ${pod}=   Execute Remote Command Check Rc Return Output   ${osm_host}   ${osm_username}   ${osm_password}   ${osm_privatekey}   kubectl get pod -n ${ns_id} --no-headers -o custom-columns=":metadata.name"
+    ${svc}=   Execute Remote Command Check Rc Return Output   ${osm_host}   ${osm_username}   ${osm_password}   ${osm_privatekey}   kubectl get svc -n ${ns_id} -l app.kubernetes.io/name=eechart -o jsonpath='{.items[0].spec.clusterIP}'
     Set Suite Variable   ${pod_name}   ${pod}
     Set Suite Variable   ${svc_ip}   ${svc}
 
@@ -103,7 +108,7 @@ Get data from EE pod
 Fail when trying to access gRPC server without TLS
 
     ${command} =   Catenate   python3 osm_ee/frontend_client.py ${svc_ip} 50050 sleep
-    ${result}=   Execute Remote Command Check Rc Return Output   ${host}   ${username}   ${password}   ${privatekey}   kubectl exec -it -n ${ns_id} ${pod_name} -- ${command}
+    ${result}=   Execute Remote Command Check Rc Return Output   ${osm_host}   ${osm_username}   ${osm_password}   ${osm_privatekey}   kubectl exec -it -n ${ns_id} ${pod_name} -- ${command}
     Should Contain   ${result}   Connection lost