diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-24 09:59:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-24 09:59:02 +0000 |
| commit | 7c8a37543f3a5fe23556fda011a24c8e787d3fad (patch) | |
| tree | fc0ef76191e3efaa6928173bce3ee8488fb4be67 /openstack_dashboard/exceptions.py | |
| parent | 8c9b86f1300e3886ba606c9fd569e6698163b20d (diff) | |
| parent | a1fdb4709c8fa2a1766732b65d28462a3bf6eb4a (diff) | |
| download | horizon-7c8a37543f3a5fe23556fda011a24c8e787d3fad.tar.gz | |
Merge "Update exception map based on neutronclient exception rearrange"
Diffstat (limited to 'openstack_dashboard/exceptions.py')
| -rw-r--r-- | openstack_dashboard/exceptions.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/openstack_dashboard/exceptions.py b/openstack_dashboard/exceptions.py index 02177f194..a84d09f6a 100644 --- a/openstack_dashboard/exceptions.py +++ b/openstack_dashboard/exceptions.py @@ -44,8 +44,7 @@ NOT_FOUND = ( cinderclient.NotFound, novaclient.NotFound, glanceclient.NotFound, - neutronclient.NetworkNotFoundClient, - neutronclient.PortNotFoundClient, + neutronclient.NotFound, heatclient.HTTPNotFound, troveclient.NotFound, ) @@ -63,15 +62,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, |