summaryrefslogtreecommitdiff
path: root/nova/api/openstack/compute/remote_consoles.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-04-20 17:15:33 +0000
committerGerrit Code Review <review@openstack.org>2023-04-20 17:15:33 +0000
commit6b3adacc66194e3ea32970f894798c61e7814f53 (patch)
tree64d8360334832c09a5c5ef257b31b5bc4db2a516 /nova/api/openstack/compute/remote_consoles.py
parent1cf650bf4f25f15ae80c31a67e54ce6615231375 (diff)
parent71855163a944e437f9c48a5765f683b55a28c720 (diff)
downloadnova-26.1.1.tar.gz
Merge "Handle InstanceInvalidState exception" into stable/zed26.1.1
Diffstat (limited to 'nova/api/openstack/compute/remote_consoles.py')
-rw-r--r--nova/api/openstack/compute/remote_consoles.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/remote_consoles.py b/nova/api/openstack/compute/remote_consoles.py
index 36015542aa..7d374ef432 100644
--- a/nova/api/openstack/compute/remote_consoles.py
+++ b/nova/api/openstack/compute/remote_consoles.py
@@ -56,6 +56,9 @@ class RemoteConsolesController(wsgi.Controller):
raise webob.exc.HTTPNotFound(explanation=e.format_message())
except exception.InstanceNotReady as e:
raise webob.exc.HTTPConflict(explanation=e.format_message())
+ except exception.InstanceInvalidState as e:
+ common.raise_http_conflict_for_instance_invalid_state(
+ e, 'get_vnc_console', id)
except NotImplementedError:
common.raise_feature_not_supported()