Merge "Bugfix: update Yardstick custom VM image name in user guide"

[yardstick.git] / yardstick / benchmark / scenarios / availability / attacker / attacker_baremetal.py

diff --git a/yardstick/benchmark/scenarios/availability/attacker/attacker_baremetal.py b/yardstick/benchmark/scenarios/availability/attacker/attacker_baremetal.py
index 6561f6b..e88fed6 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/attacker/attacker_baremetal.py
+++ b/yardstick/benchmark/scenarios/availability/attacker/attacker_baremetal.py
@@ -24,7 +24,7 @@ def _execute_shell_command(command, stdin=None):
     except Exception:
         exitcode = -1
         output = traceback.format_exc()
-        LOG.error("exec command '%s' error:\n " % command)
+        LOG.error("exec command '%s' error:\n ", command)
         LOG.error(traceback.format_exc())
 
     return exitcode, output
@@ -34,7 +34,7 @@ class BaremetalAttacker(BaseAttacker):
     __attacker_type__ = 'bare-metal-down'
 
     def setup(self):
-        LOG.debug("config:%s context:%s" % (self._config, self._context))
+        LOG.debug("config:%s context:%s", self._config, self._context)
         host = self._context.get(self._config['host'], None)
         ip = host.get("ip", None)
         user = host.get("user", "root")
@@ -61,14 +61,15 @@ class BaremetalAttacker(BaseAttacker):
             self.setup_done = True
 
     def check(self):
-        exit_status, stdout, stderr = self.connection.execute(
-            "/bin/sh -s {0} -W 10".format(self.host_ip),
-            stdin=open(self.check_script, "r"))
+        with open(self.check_script, "r") as stdin_file:
+            exit_status, stdout, stderr = self.connection.execute(
+                "/bin/sh -s {0} -W 10".format(self.host_ip),
+                stdin=stdin_file)
 
-        LOG.debug("check ret: %s out:%s err:%s" %
-                  (exit_status, stdout, stderr))
+        LOG.debug("check ret: %s out:%s err:%s",
+                  exit_status, stdout, stderr)
         if not stdout or "running" not in stdout:
-            LOG.info("the host (ipmi_ip:%s) is not running!" % self.ipmi_ip)
+            LOG.info("the host (ipmi_ip:%s) is not running!", self.ipmi_ip)
             return False
 
         return True
@@ -76,8 +77,8 @@ class BaremetalAttacker(BaseAttacker):
     def inject_fault(self):
         exit_status, stdout, stderr = self.connection.execute(
             "shutdown -h now")
-        LOG.debug("inject fault ret: %s out:%s err:%s" %
-                  (exit_status, stdout, stderr))
+        LOG.debug("inject fault ret: %s out:%s err:%s",
+                  exit_status, stdout, stderr)
         if not exit_status:
             LOG.info("inject fault success")
 
@@ -91,17 +92,18 @@ class BaremetalAttacker(BaseAttacker):
             ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT)
             pwd = host.get("pwd", None)
 
-            LOG.debug("jump_host ip:%s user:%s" % (ip, user))
+            LOG.debug("jump_host ip:%s user:%s", ip, user)
             self.jump_connection = ssh.SSH(user, ip, password=pwd,
                                            port=ssh_port)
             self.jump_connection.wait(timeout=600)
             LOG.debug("ssh jump host success!")
 
         if self.jump_connection is not None:
-            exit_status, stdout, stderr = self.jump_connection.execute(
-                "/bin/bash -s {0} {1} {2} {3}".format(
-                    self.ipmi_ip, self.ipmi_user, self.ipmi_pwd, "on"),
-                stdin=open(self.recovery_script, "r"))
+            with open(self.recovery_script, "r") as stdin_file:
+                exit_status, stdout, stderr = self.jump_connection.execute(
+                    "/bin/bash -s {0} {1} {2} {3}".format(
+                        self.ipmi_ip, self.ipmi_user, self.ipmi_pwd, "on"),
+                    stdin=stdin_file)
         else:
             exit_status, stdout = _execute_shell_command(
                 "/bin/bash -s {0} {1} {2} {3}".format(