From d08314d80fb9b72c43fdf90249c8b1b81b503d8c Mon Sep 17 00:00:00 2001 From: Michael Still Date: Wed, 25 Apr 2018 14:46:21 +1000 Subject: [PATCH] Convert xenapi's xvp console to processutils. Convert xenapi's xvp console implementation to use processutils directly. Change-Id: I27d5365a2d231387e4acc0b665b161edab9e3a17 blueprint: execs-ive-had-a-few --- nova/console/xvp.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nova/console/xvp.py b/nova/console/xvp.py index 07c13eab8bc4..cdaf54b58f3e 100644 --- a/nova/console/xvp.py +++ b/nova/console/xvp.py @@ -27,7 +27,6 @@ import nova.conf from nova import context from nova import db from nova.i18n import _ -from nova import utils CONF = nova.conf.CONF @@ -119,10 +118,10 @@ class XVPConsoleProxy(object): return LOG.debug('Starting xvp') try: - utils.execute('xvp', - '-p', CONF.xvp.console_xvp_pid, - '-c', CONF.xvp.console_xvp_conf, - '-l', CONF.xvp.console_xvp_log) + processutils.execute('xvp', + '-p', CONF.xvp.console_xvp_pid, + '-c', CONF.xvp.console_xvp_conf, + '-l', CONF.xvp.console_xvp_log) except processutils.ProcessExecutionError as err: LOG.error('Error starting xvp: %s', err) @@ -178,7 +177,7 @@ class XVPConsoleProxy(object): flag = '-x' # xvp will blow up on passwords that are too long (mdragon) password = password[:maxlen] - out, err = utils.execute('xvp', flag, process_input=password) + out, err = processutils.execute('xvp', flag, process_input=password) if err: raise processutils.ProcessExecutionError(_("Failed to run xvp.")) return out.strip()