Step 1: Move vm scripts to the right place

[integration/test.git] / test / tools / clustering / cluster-deployer / remote_host.py

diff --git a/test/tools/clustering/cluster-deployer/remote_host.py b/test/tools/clustering/cluster-deployer/remote_host.py
index 5da74b77a8a0e259f09f114c4abfce4e5783ba93..cb5d1818dcc2dc8fd0e252d7158e3447270e31e5 100644 (file)
--- a/test/tools/clustering/cluster-deployer/remote_host.py
+++ b/test/tools/clustering/cluster-deployer/remote_host.py
@@ -6,6 +6,8 @@
 
 from SSHLibrary import SSHLibrary
 
+import os
+
 
 class RemoteHost:
     def __init__(self, host, user, password, rootdir):
@@ -13,30 +15,39 @@ class RemoteHost:
         self.user = user
         self.password = password
         self.rootdir = rootdir
+        self.lib = SSHLibrary()
+        self.lib.open_connection(self.host)
+        self.lib.login(username=self.user, password=self.password)
+
+    def __del__(self):
+        self.lib.close_connection()
 
     def exec_cmd(self, command):
         print "Executing command " + command + " on host " + self.host
-        lib = SSHLibrary()
-        lib.open_connection(self.host)
-        lib.login(username=self.user, password=self.password)
-        rc = lib.execute_command(command, return_rc=True)
-        lib.close_connection()
+        rc = self.lib.execute_command(command, return_rc=True)
         if rc[1] != 0:
-            raise Exception('remote command failed [{0}] with exit code {1}'.format(command, rc))
+            raise Exception('remote command failed [{0}] with exit code {1}.'
+                            'For linux-based vms, Please make sure requiretty is disabled in the /etc/sudoers file'
+                            .format(command, rc))
 
     def mkdir(self, dir_name):
         self.exec_cmd("mkdir -p " + dir_name)
 
     def copy_file(self, src, dest):
-        lib = SSHLibrary()
-        lib.open_connection(self.host)
-        lib.login(username=self.user, password=self.password)
+        if src is None:
+            print "src is None not copy anything to " + dest
+            return
+
+        if os.path.exists(src) is False:
+            print "Src file " + src + " was not found"
+            return
+
         print "Copying " + src + " to " + dest + " on " + self.host
-        lib.put_file(src, dest)
-        lib.close_connection()
+        self.lib.put_file(src, dest)
 
     def kill_controller(self):
-        self.exec_cmd("ps axf | grep karaf | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
+        self.exec_cmd("sudo ps axf | grep karaf | grep -v grep "
+                      "| awk '{print \"kill -9 \" $1}' | sudo sh")
 
     def start_controller(self, dir_name):
         self.exec_cmd(dir_name + "/odl/bin/start")