diff options
| author | Michael Still <mikal@stillhq.com> | 2013-05-03 10:47:39 +1000 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2013-05-04 15:17:40 +1000 |
| commit | 1a11790f2d26ec92858a3ffa100388310912fae1 (patch) | |
| tree | 8e49c5f13ae91135d66b2d5b270d04ade15fc606 /nova/console | |
| parent | 45c07fcb7ba5434d84803442497cd6bb47284dcf (diff) | |
| download | nova-1a11790f2d26ec92858a3ffa100388310912fae1.tar.gz nova-1a11790f2d26ec92858a3ffa100388310912fae1.tar.xz nova-1a11790f2d26ec92858a3ffa100388310912fae1.zip | |
Convert to using oslo's execute() method.
There are some small warts (mostly around other execute() like
methods which reuse the exception). I will fix these warts in later
reviews.
Change-Id: Ice9cdbdc5f3e5a9f8365f5d99acf1863a9fe3e7a
Diffstat (limited to 'nova/console')
| -rw-r--r-- | nova/console/xvp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/console/xvp.py b/nova/console/xvp.py index 1e9fbcb5d..be3a41c1d 100644 --- a/nova/console/xvp.py +++ b/nova/console/xvp.py @@ -25,9 +25,9 @@ from oslo.config import cfg from nova import context from nova import db -from nova import exception from nova.openstack.common import excutils from nova.openstack.common import log as logging +from nova.openstack.common import processutils from nova import paths from nova import utils @@ -143,7 +143,7 @@ class XVPConsoleProxy(object): '-p', CONF.console_xvp_pid, '-c', CONF.console_xvp_conf, '-l', CONF.console_xvp_log) - except exception.ProcessExecutionError, err: + except processutils.ProcessExecutionError, err: LOG.error(_('Error starting xvp: %s') % err) def _xvp_restart(self): @@ -200,5 +200,5 @@ class XVPConsoleProxy(object): password = password[:maxlen] out, err = utils.execute('xvp', flag, process_input=password) if err: - raise exception.ProcessExecutionError(_("Failed to run xvp.")) + raise processutils.ProcessExecutionError(_("Failed to run xvp.")) return out.strip() |
