Merge "Update exception map based on neutronclient exception rearrange"

This commit is contained in:
Jenkins 2014-07-24 09:59:02 +00:00 committed by Gerrit Code Review
commit 7c8a37543f

View File

@ -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,