From: Zack Cerza <zack@redhat.com>
Date: Thu, 18 Aug 2016 21:35:27 +0000 (-0600)
Subject: PhysicalConsole: split out command generation
X-Git-Tag: 1.1.0~544^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7d2d48a0c4b7287e84212605f1f0c71db9dc394;p=teuthology.git

PhysicalConsole: split out command generation

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/orchestra/console.py b/teuthology/orchestra/console.py
index 7b965e74f..c74da6e1c 100644
--- a/teuthology/orchestra/console.py
+++ b/teuthology/orchestra/console.py
@@ -36,23 +36,24 @@ class PhysicalConsole():
         """
         if not self.ipmiuser or not self.ipmipass or not self.ipmidomain:
             log.error('Must set ipmi_user, ipmi_password, and ipmi_domain in .teuthology.yaml')  # noqa
-        log.debug('pexpect command: ipmitool -H {s}.{dn} -I lanplus -U {ipmiuser} -P {ipmipass} {cmd}'.format(  # noqa
-                  cmd=cmd,
-                  s=self.shortname,
-                  dn=self.ipmidomain,
-                  ipmiuser=self.ipmiuser,
-                  ipmipass=self.ipmipass))
-
-        child = pexpect.spawn('ipmitool -H {s}.{dn} -I lanplus -U {ipmiuser} -P {ipmipass} {cmd}'.format(  # noqa
-                              cmd=cmd,
-                              s=self.shortname,
-                              dn=self.ipmidomain,
-                              ipmiuser=self.ipmiuser,
-                              ipmipass=self.ipmipass))
+        full_command = self._build_command(cmd)
+        log.debug('pexpect command: %s', full_command)
+        child = pexpect.spawn(full_command)
         if self.logfile:
             child.logfile = self.logfile
         return child
 
+    def _build_command(self, subcommand):
+        template = \
+            'ipmitool -H {s}.{dn} -I lanplus -U {ipmiuser} -P {ipmipass} {cmd}'
+        return template.format(
+            cmd=subcommand,
+            s=self.shortname,
+            dn=self.ipmidomain,
+            ipmiuser=self.ipmiuser,
+            ipmipass=self.ipmipass,
+        )
+
     def _exit_session(self, child, timeout=None):
         child.send('~.')
         t = timeout or self.timeout