[Storage] Use ssh connection retries

Author: jpeimer

tests/storage/snapshots/utils.py

@@ -47,22 +47,3 @@ def fail_to_create_snapshot_no_permissions(snapshot_name, namespace, vm_name, cl
 def start_windows_vm_after_restore(vm_restore, windows_vm):
     vm_restore.wait_restore_done(timeout=TIMEOUT_10MIN)
     running_vm(vm=windows_vm)
-
-
-def run_command_on_vm_and_check_output(vm, command, expected_result):
-    """Run command on RHEL VM via SSH and verify expected result is in output.
-
-    Args:
-        vm (VirtualMachineForTests): VM to run command on.
-        command (str): Command to run.
-        expected_result (str): Expected result to check.
-
-    Raises:
-        AssertionError: If expected result is not in output.
-    """
-    cmd_output = run_ssh_commands(
-        host=vm.ssh_exec,
-        commands=shlex.split(f"bash -c {shlex.quote(command)}"),
-    )[0].strip()
-    expected_result = expected_result.strip()
-    assert expected_result in cmd_output, f"Expected '{expected_result}' in output '{cmd_output}'"

utilities/storage.py

@@ -646,6 +646,26 @@ def write_file_via_ssh(vm: virt_util.VirtualMachineForTests, filename: str, cont
     run_ssh_commands(host=vm.ssh_exec, commands=cmd)
 
 
+
+def run_command_on_vm_and_check_output(vm, command, expected_result):
+    """Run command on RHEL VM via SSH and verify expected result is in output.
+
+    Args:
+        vm (VirtualMachineForTests): VM to run command on.
+        command (str): Command to run.
+        expected_result (str): Expected result to check.
+
+    Raises:
+        AssertionError: If expected result is not in output.
+    """
+    cmd_output = run_ssh_commands(
+        host=vm.ssh_exec,
+        commands=shlex.split(f"bash -c {shlex.quote(command)}"),
+    )[0].strip()
+    expected_result = expected_result.strip()
+    assert expected_result in cmd_output, f"Expected '{expected_result}' in output '{cmd_output}'"
+
+
 def run_command_on_cirros_vm_and_check_output(vm, command, expected_result):
     with console.Console(vm=vm) as vm_console:
         vm_console.sendline(command)