Change netvm name

Change netvm to net-vm, set it as a variable Signed-off-by: Mariia Azbeleva <[email protected]>
tiiuae · Oct 6, 2023 · 73b0946 · 73b0946
1 parent eaee0c1
commit 73b0946
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Robot-Framework/config/variables.robot b/Robot-Framework/config/variables.robot
@@ -13,8 +13,9 @@ Set Variables
     Set Global Variable  ${SERIAL_PORT}        ${config['addresses']['${DEVICE}']['serial_port']}
     Set Global Variable  ${DEVICE_IP_ADDRESS}  ${config['addresses']['${DEVICE}']['device_ip_address']}
     Set Global Variable  ${SOCKET_IP_ADDRESS}  ${config['addresses']['${DEVICE}']['socket_ip_address']}
-    Set Global Variable  ${NETVM_SERVICE}      [email protected]
     Set Global Variable  ${THREADS_NUMBER}     ${config['addresses']['${DEVICE}']['threads']}
+    Set Global Variable  ${NETVM_NAME}         net-vm
+    Set Global Variable  ${NETVM_SERVICE}      microvm@${NETVM_NAME}.service
 
 Read Config
     [Arguments]  ${file_path}=../config/test_config.json

diff --git a/Robot-Framework/test-suites/bat-tests/netvm.robot b/Robot-Framework/test-suites/bat-tests/netvm.robot
@@ -130,7 +130,7 @@ Connect to netvm via tunnel
     Clear iptables rules
     Create tunnel
     Log To Console     Connecting to NEtVM via tunnel
-    ${connection}=       Connect     IP=${DEVICE_IP_ADDRESS}    PORT=${local_port}    target_output=ghaf@netvm
+    ${connection}=       Connect     IP=${DEVICE_IP_ADDRESS}    PORT=${local_port}    target_output=${LOGIN}@${NETVM_NAME}
     Set Global Variable  ${netvm}    ${connection}
     [Return]           ${netvm}
 
@@ -144,12 +144,12 @@ Copy keys
     Write            ${\n}
     Read Until       Enter same passphrase again:
     Write            ${\n}
-    Read Until       ghaf@ghaf-host:
+    Read Until       ${LOGIN}@ghaf-host:
     Write            ssh-copy-id -o StrictHostKeyChecking=no ${netvm_ip}
     ${output}=       Read       delay=30s
     Should Contain   ${output}  Password:
     Write            ${password}
-    Read Until       ghaf@ghaf-host:
+    Read Until       ${LOGIN}@ghaf-host:
 
 Clear iptables rules
     [Documentation]  Clear IP tables rules to open ports for creating tunnel
@@ -168,12 +168,12 @@ Login into NetVM
     ${passw}        Run Keyword And Return Status    Should Contain    ${output}     Password
     IF  ${passw}
         Write       ${PASSWORD}
-        Read Until  ghaf@netvm
+        Read Until  ${LOGIN}@${NETVM_NAME}
     END
     Write           sudo su
     Read Until      password
     Write           ${PASSWORD}
-    Read Until      root@netvm
+    Read Until      root@${NETVM_NAME}
 
 Configure wifi
     [Arguments]   ${netvm}  ${SSID}  ${passw}