PTL change

[doctor.git] / doctor_tests / scenario / network_failure.py

diff --git a/doctor_tests/scenario/network_failure.py b/doctor_tests/scenario/network_failure.py
index b94a622..b55440e 100644 (file)
--- 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......')
@@ -44,28 +47,38 @@ 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
+            self.log.info('Already get the disable_netork.log '
+                          'from down_host......')
+            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.log.info('Get the disable_netork.log from down_host(host_name:%s, host_ip:%s)'
+            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)
+
+            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,
-                           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.sh', 'disable_network.sh')
+        client = SSHClient(
+            compute_ip,
+            self.installer.node_user_name,
+            key_filename=self.installer.get_ssh_key_from_installer(),
+            look_for_keys=True,
+            log=self.log)
+        client.scp(file_name, 'disable_network.sh')
         command = 'bash disable_network.sh > disable_network.log 2>&1 &'
         client.ssh(command)