Merge pull request #3706 from nanli1/seperate_virsh_console_login_fun…

…ction seperate virsh console login function
avocado-framework · Jul 26, 2023 · 191913a · 191913a
2 parents 9742b58 + a7c9b8e
commit 191913a
Showing 1 changed file with 35 additions and 23 deletions.
diff --git a/virttest/utils_test/libvirt.py b/virttest/utils_test/libvirt.py
@@ -689,29 +689,7 @@ def verify_virsh_console(session, user, passwd, timeout=10, debug=False):
     log = ""
     console_cmd = "cat /proc/cpuinfo"
     try:
-        while True:
-            match, text = session.read_until_last_line_matches(
-                [r"[E|e]scape character is", r"login:",
-                 r"[P|p]assword:", session.prompt],
-                timeout, internal_timeout=1)
-
-            if match == 0:
-                if debug:
-                    LOG.debug("Got '^]', sending '\\n'")
-                session.sendline()
-            elif match == 1:
-                if debug:
-                    LOG.debug("Got 'login:', sending '%s'", user)
-                session.sendline(user)
-            elif match == 2:
-                if debug:
-                    LOG.debug("Got 'Password:', sending '%s'", passwd)
-                session.sendline(passwd)
-            elif match == 3:
-                if debug:
-                    LOG.debug("Got Shell prompt -- logged in")
-                break
-
+        virsh_console_login(session, user, passwd, timeout, debug=debug)
         status, output = session.cmd_status_output(console_cmd)
         LOG.info("output of command:\n%s", output)
         session.close()
@@ -729,6 +707,40 @@ def verify_virsh_console(session, user, passwd, timeout=10, debug=False):
     return True
 
 
+def virsh_console_login(session, user, passwd, timeout=10, debug=False):
+    """
+    Login console
+
+    :param session: login session
+    :param user: login user name
+    :param passwd: login user password
+    :param timeout: time out
+    :param debug: Whether to enable debug
+    """
+    while True:
+        match, text = session.read_until_last_line_matches(
+            [r"[E|e]scape character is", r"login:",
+             r"[P|p]assword:", session.prompt],
+            timeout, internal_timeout=1)
+
+        if match == 0:
+            if debug:
+                LOG.debug("Got '^]', sending '\\n'")
+            session.sendline()
+        elif match == 1:
+            if debug:
+                LOG.debug("Got 'login:', sending '%s'", user)
+            session.sendline(user)
+        elif match == 2:
+            if debug:
+                LOG.debug("Got 'Password:', sending '%s'", passwd)
+            session.sendline(passwd)
+        elif match == 3:
+            if debug:
+                LOG.debug("Got Shell prompt -- logged in")
+            break
+
+
 def pci_info_from_address(address_dict, radix=10, type="label"):
     """
     Generate a pci label or id from a dict of address.