[KVM-AUTOTEST,06/17] KVM test: rename VM.remote_login() to VM.login()

Commit Message

Michael Goldish Jan. 3, 2011, 6:27 p.m. UTC

None

Patch

diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index 2997c8f..830ee99 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -341,7 +341,7 @@  def postprocess(test, params, env):
         for vm in env.get_all_vms():
             if vm.is_alive():
                 try:
-                    session = vm.remote_login()
+                    session = vm.login()
                     session.close()
                 except kvm_utils.LoginError:
                     vm.destroy(gracefully=False)
diff --git a/client/tests/kvm/kvm_test_utils.py b/client/tests/kvm/kvm_test_utils.py
index 539bb10..cad4bea 100644
--- a/client/tests/kvm/kvm_test_utils.py
+++ b/client/tests/kvm/kvm_test_utils.py
@@ -76,7 +76,7 @@  def wait_for_login(vm, nic_index=0, timeout=240, start=0, step=2, serial=None):
         time.sleep(start)
         while time.time() < end_time:
             try:
-                session = vm.remote_login(nic_index=nic_index)
+                session = vm.login(nic_index=nic_index)
                 break
             except kvm_utils.LoginError, e:
                 logging.debug(e)
diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index 0bc8a8b..e310401 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -795,7 +795,7 @@  class VM:
                 # Try to destroy with shell command
                 logging.debug("Trying to shutdown VM with shell command...")
                 try:
-                    session = self.remote_login()
+                    session = self.login()
                 except kvm_utils.LoginError, e:
                     logging.debug(e)
                 else:
@@ -1059,7 +1059,7 @@  class VM:
         return shm * 4.0 / 1024
 
 
-    def remote_login(self, nic_index=0, timeout=10):
+    def login(self, nic_index=0, timeout=10):
         """
         Log into the guest via SSH/Telnet/Netcat.
         If timeout expires while waiting for output from the guest (e.g. a
@@ -1091,13 +1091,20 @@  class VM:
         return session
 
 
+    def remote_login(self, nic_index=0, timeout=10):
+        """
+        Alias for login() for backward compatibility.
+        """
+        return self.login(nic_index, timeout)
+
+
     def wait_for_login(self, nic_index=0, timeout=240, internal_timeout=10):
         """
         Make multiple attempts to log into the guest via SSH/Telnet/Netcat.
 
         @param nic_index: The index of the NIC to connect to.
         @param timeout: Time (seconds) to keep trying to log in.
-        @param internal_timeout: Timeout to pass to remote_login().
+        @param internal_timeout: Timeout to pass to login().
         @return: A ShellSession object.
         """
         logging.debug("Attempting to log into '%s' (timeout %ds)" % (self.name,
@@ -1105,12 +1112,12 @@  class VM:
         end_time = time.time() + timeout
         while time.time() < end_time:
             try:
-                return self.remote_login(nic_index, internal_timeout)
+                return self.login(nic_index, internal_timeout)
             except kvm_utils.LoginError, e:
                 logging.debug(e)
             time.sleep(2)
         # Timeout expired; try one more time but don't catch exceptions
-        return self.remote_login(nic_index, internal_timeout)
+        return self.login(nic_index, internal_timeout)
 
 
     def copy_files_to(self, local_path, remote_path, nic_index=0, timeout=600):
@@ -1253,7 +1260,7 @@  class VM:
         """
         Get the cpu count of the VM.
         """
-        session = self.remote_login()
+        session = self.login()
         try:
             return int(session.cmd(self.params.get("cpu_chk_cmd")))
         finally:
@@ -1267,7 +1274,7 @@  class VM:
         @param check_cmd: Command used to check memory. If not provided,
                 self.params.get("mem_chk_cmd") will be used.
         """
-        session = self.remote_login()
+        session = self.login()
         try:
             if not cmd:
                 cmd = self.params.get("mem_chk_cmd")
diff --git a/client/tests/kvm/tests/boot_savevm.py b/client/tests/kvm/tests/boot_savevm.py
index cf5e433..c805816 100644
--- a/client/tests/kvm/tests/boot_savevm.py
+++ b/client/tests/kvm/tests/boot_savevm.py
@@ -50,7 +50,7 @@  def run_boot_savevm(test, params, env):
         if (time.time() > login_expire):
             login_expire = time.time() + savevm_login_delay
             logging.info("Logging in after loadvm...")
-            session = vm.remote_login()
+            session = vm.login()
             logging.info("Logged in to guest!")
             break
 
diff --git a/client/tests/kvm/tests/timedrift.py b/client/tests/kvm/tests/timedrift.py
index 489cf9d..1dea364 100644
--- a/client/tests/kvm/tests/timedrift.py
+++ b/client/tests/kvm/tests/timedrift.py
@@ -87,7 +87,7 @@  def run_timedrift(test, params, env):
             # Open shell sessions with the guest
             logging.info("Starting load on guest...")
             for i in range(guest_load_instances):
-                load_session = vm.remote_login()
+                load_session = vm.login()
                 # Set output func to None to stop it from being called so we
                 # can change the callback function and the parameters it takes
                 # with no problems