summaryrefslogtreecommitdiffstats
path: root/doctor_tests/scenario
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2017-10-09 15:25:33 +0800
committerCarlos Goncalves <mail@cgoncalves.pt>2017-10-09 10:49:59 +0000
commit2c9569e66c4f0e333d603f93b280768bea4f2d07 (patch)
tree6459b8f961a8245fd1aaef8ba870fddf45706b1a /doctor_tests/scenario
parent5733b9ce1dcfb40e0ef6a956c0e6c092829fc6d6 (diff)
fix to get logfile
Change-Id: I44cc6c5108eb48191ca36cbcb44f787ea542f3ce Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn> (cherry picked from commit b3dcaa337fa91b3123fa08e8b8dd2e81184a91dd)
Diffstat (limited to 'doctor_tests/scenario')
-rw-r--r--doctor_tests/scenario/network_failure.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/doctor_tests/scenario/network_failure.py b/doctor_tests/scenario/network_failure.py
index b94a622d..b2309435 100644
--- a/doctor_tests/scenario/network_failure.py
+++ b/doctor_tests/scenario/network_failure.py
@@ -8,6 +8,7 @@
##############################################################################
from doctor_tests.identity_auth import get_session
from doctor_tests.os_clients import nova_client
+from doctor_tests.common.utils import get_doctor_test_root_dir
from doctor_tests.common.utils import SSHClient
LINK_DOWN_SCRIPT = """
@@ -29,8 +30,10 @@ class NetworkFault(object):
self.log = log
self.installer = installer
self.nova = nova_client(self.conf.nova_version, get_session())
+ self.test_dir = get_doctor_test_root_dir()
self.host = None
self.GetLog = False
+ self.disable_network_log = None
def start(self, host):
self.log.info('fault inject start......')
@@ -45,20 +48,23 @@ class NetworkFault(object):
def get_disable_network_log(self):
if self.GetLog:
self.log.info('Already get the disable_netork.log from down_host......')
- return
+ return self.disable_network_log
if self.host is not None:
client = SSHClient(self.host.ip,
self.installer.node_user_name,
key_filename=self.installer.get_ssh_key_from_installer(),
look_for_keys=True,
log=self.log)
- client.scp('disable_network.log', './disable_network.log', method='get')
+
+ self.disable_network_log = '{0}/{1}'.format(self.test_dir, 'disable_network.log')
+ client.scp('disable_network.log', self.disable_network_log, method='get')
self.log.info('Get the disable_netork.log from down_host(host_name:%s, host_ip:%s)'
% (self.host.name, self.host.ip))
self.GetLog = True
+ return self.disable_network_log
def _set_link_down(self, compute_ip):
- file_name = './disable_network.sh'
+ file_name = '{0}/{1}'.format(self.test_dir, 'disable_network.sh')
with open(file_name, 'w') as file:
file.write(LINK_DOWN_SCRIPT.format(compute_ip=compute_ip))
client = SSHClient(compute_ip,
@@ -66,6 +72,6 @@ class NetworkFault(object):
key_filename=self.installer.get_ssh_key_from_installer(),
look_for_keys=True,
log=self.log)
- client.scp('./disable_network.sh', 'disable_network.sh')
+ client.scp(file_name, 'disable_network.sh')
command = 'bash disable_network.sh > disable_network.log 2>&1 &'
client.ssh(command)