diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-12 04:51:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-12 04:51:35 +0000 |
| commit | 0fd6e49d6bb1cf2099cdd36e0bfa3c0854039e08 (patch) | |
| tree | 07536c9069a67c496c63bb3be24130060c94e8c0 /nova/api | |
| parent | 9bac8aa336d1b40b1bf4e026af72b6f31d2a23fc (diff) | |
| parent | 702fdf2fc1acc32b5ccd9e0830e574c42770ab5d (diff) | |
Merge "Fix check instance host for instance action"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/console_output.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/server_start_stop.py | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index 4f01bbaf4..60594cb53 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -65,6 +65,8 @@ class ConsoleOutputController(wsgi.Controller): length) except exception.NotFound: raise webob.exc.HTTPNotFound(_('Unable to get console')) + except exception.InstanceNotReady as e: + raise webob.exc.HTTPConflict(explanation=unicode(e)) # XML output is not correctly escaped, so remove invalid characters remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F-\x0D]') diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py index 733972083..a13aabb05 100644 --- a/nova/api/openstack/compute/contrib/server_start_stop.py +++ b/nova/api/openstack/compute/contrib/server_start_stop.py @@ -44,7 +44,10 @@ class ServerStartStopActionController(wsgi.Controller): context = req.environ['nova.context'] instance = self._get_instance(context, id) LOG.debug(_('start instance'), instance=instance) - self.compute_api.start(context, instance) + try: + self.compute_api.start(context, instance) + except exception.InstanceNotReady as e: + raise webob.exc.HTTPConflict(explanation=unicode(e)) return webob.Response(status_int=202) @wsgi.action('os-stop') @@ -53,7 +56,10 @@ class ServerStartStopActionController(wsgi.Controller): context = req.environ['nova.context'] instance = self._get_instance(context, id) LOG.debug(_('stop instance'), instance=instance) - self.compute_api.stop(context, instance) + try: + self.compute_api.stop(context, instance) + except exception.InstanceNotReady as e: + raise webob.exc.HTTPConflict(explanation=unicode(e)) return webob.Response(status_int=202) |