X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Finstaller%2Fapex.py;h=16f0376e0526b3f5db340c5ba6ce08c977368726;hb=aa16cb3987bad7abfb8743cb205980a50d5f12fe;hp=2a1ce94bc4b642ccb0ea3b1622266e65a3ae96b5;hpb=079ac9a481fcc1baa53cb5ab2896bbe037585f3b;p=doctor.git

diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py
index 2a1ce94b..16f0376e 100644
--- a/doctor_tests/installer/apex.py
+++ b/doctor_tests/installer/apex.py
@@ -13,6 +13,7 @@ import pwd
 import stat
 import subprocess
 
+from doctor_tests.common.utils import get_doctor_test_root_dir
 from doctor_tests.common.utils import SSHClient
 from doctor_tests.installer.base import BaseInstaller
 
@@ -31,6 +32,7 @@ class ApexInstaller(BaseInstaller):
         self.controllers = list()
         self.controller_clients = list()
         self.servers = list()
+        self.test_dir = get_doctor_test_root_dir()
 
     def setup(self):
         self.log.info('Setup Apex installer start......')
@@ -52,14 +54,14 @@ class ApexInstaller(BaseInstaller):
             self.log.info('Already have SSH keys from Apex installer......')
             return self.key_file
 
-        self.client.scp('/home/stack/.ssh/id_rsa', './instack_key', method='get')
+        ssh_key = '{0}/{1}'.format(self.test_dir, 'instack_key')
+        self.client.scp('/home/stack/.ssh/id_rsa', ssh_key, method='get')
         user = getpass.getuser()
         uid = pwd.getpwnam(user).pw_uid
         gid = grp.getgrnam(user).gr_gid
-        os.chown('./instack_key', uid, gid)
-        os.chmod('./instack_key', stat.S_IREAD)
-        current_dir = os.curdir
-        self.key_file = '{0}/{1}'.format(current_dir, 'instack_key')
+        os.chown(ssh_key, uid, gid)
+        os.chmod(ssh_key, stat.S_IREAD)
+        self.key_file = ssh_key
         return self.key_file
 
     def get_controller_ips(self):
@@ -91,7 +93,7 @@ class ApexInstaller(BaseInstaller):
     def setup_stunnel(self):
         self.log.info('Setup ssh stunnel in controller nodes in Apex installer......')
         for node_ip in self.controllers:
-            cmd = "sudo ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s.log 2>&1 < /dev/null &" \
+            cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s.log 2>&1 < /dev/null &" \
                   % (self.key_file, self.node_user_name, node_ip,
                      self.conf.consumer.port, self.conf.consumer.port, node_ip)
             server = subprocess.Popen(cmd, shell=True)