summaryrefslogtreecommitdiff
path: root/openstack_dashboard/exceptions.py
diff options
context:
space:
mode:
authorAkihiro Motoki <motoki@da.jp.nec.com>2014-03-23 06:46:05 +0900
committerAkihiro Motoki <motoki@da.jp.nec.com>2014-07-22 19:33:26 +0900
commita1fdb4709c8fa2a1766732b65d28462a3bf6eb4a (patch)
treefabdd600abc6885b6c8f64c98cc0124664435c10 /openstack_dashboard/exceptions.py
parent49d860140b7a742e8192c9166c541d759af7c750 (diff)
downloadhorizon-a1fdb4709c8fa2a1766732b65d28462a3bf6eb4a.tar.gz
Update exception map based on neutronclient exception rearrange
Change-Id: I59f31d269f97d86ce9b681dc7714c9a10892a3a2 Closes-Bug: #1296148 Related-Bug: #1284317
Diffstat (limited to 'openstack_dashboard/exceptions.py')
-rw-r--r--openstack_dashboard/exceptions.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/openstack_dashboard/exceptions.py b/openstack_dashboard/exceptions.py
index 89e7ceb59..b6bb4ba17 100644
--- a/openstack_dashboard/exceptions.py
+++ b/openstack_dashboard/exceptions.py
@@ -43,8 +43,7 @@ NOT_FOUND = (
cinderclient.NotFound,
novaclient.NotFound,
glanceclient.NotFound,
- neutronclient.NetworkNotFoundClient,
- neutronclient.PortNotFoundClient,
+ neutronclient.NotFound,
heatclient.HTTPNotFound,
troveclient.NotFound,
)
@@ -62,15 +61,8 @@ RECOVERABLE = (
novaclient.ClientException,
novaclient.Forbidden,
glanceclient.ClientException,
- # NOTE(amotoki): Neutron exceptions other than the first one
- # are recoverable in many cases (e.g., NetworkInUse is not
- # raised once VMs which use the network are terminated).
neutronclient.Forbidden,
neutronclient.NeutronClientException,
- neutronclient.NetworkInUseClient,
- neutronclient.PortInUseClient,
- neutronclient.AlreadyAttachedClient,
- neutronclient.StateInvalidClient,
swiftclient.ClientException,
heatclient.HTTPForbidden,
heatclient.HTTPException,