From b3dcaa337fa91b3123fa08e8b8dd2e81184a91dd Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Mon, 9 Oct 2017 15:25:33 +0800 Subject: fix to get logfile Change-Id: I44cc6c5108eb48191ca36cbcb44f787ea542f3ce Signed-off-by: dongwenjuan --- doctor_tests/installer/apex.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'doctor_tests/installer') diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py index 2a1ce94b..b64a3662 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): -- cgit 1.2.3-korg