From a1fdb4709c8fa2a1766732b65d28462a3bf6eb4a Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Sun, 23 Mar 2014 06:46:05 +0900
Subject: [PATCH] Update exception map based on neutronclient exception
 rearrange

Change-Id: I59f31d269f97d86ce9b681dc7714c9a10892a3a2
Closes-Bug: #1296148
Related-Bug: #1284317
---
 openstack_dashboard/exceptions.py | 10 +---------
 1 file changed, 1 insertion(+), 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,