From 17bcb14267a49e6ce5eb85fe77bbe3e1f669cdad Mon Sep 17 00:00:00 2001
From: Boden R <bodenvmw@gmail.com>
Date: Tue, 17 Oct 2017 15:53:46 -0600
Subject: [PATCH] use FAULT_MAP from neutron-lib

The FAULT_MAP is now located in neutron-lib and will be removed from
neutron with Ib051555ea8496ed7eec8ed30733c964012e31c32
This patch updates imports to use neutron-lib's FAULT_MAP.

Depends-On: I8e79f29206ec244d870e19f99c18ccaaa50b4761

Change-Id: Iea354fb3a586a4e33759d9229d70d4a74fea24dc
---
 vmware_nsx/plugins/nsx_mh/plugin.py | 18 +++++++++---------
 vmware_nsx/plugins/nsx_v3/plugin.py | 19 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/vmware_nsx/plugins/nsx_mh/plugin.py b/vmware_nsx/plugins/nsx_mh/plugin.py
index 7502a9036f..960b2fb570 100644
--- a/vmware_nsx/plugins/nsx_mh/plugin.py
+++ b/vmware_nsx/plugins/nsx_mh/plugin.py
@@ -17,6 +17,7 @@ import uuid
 
 from neutron_lib.api.definitions import external_net as extnet_apidef
 from neutron_lib.api.definitions import port_security as psec
+from neutron_lib.api import faults
 from neutron_lib.api import validators
 from neutron_lib import constants
 from neutron_lib import context as q_context
@@ -34,7 +35,6 @@ import webob.exc
 
 from neutron.api import extensions as neutron_extensions
 from neutron.api.v2 import attributes as attr
-from neutron.api.v2 import base
 from neutron.db import _model_query as model_query
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import _utils as db_utils
@@ -766,14 +766,14 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
         Exceptions specific to the NSX Plugin are mapped to standard
         HTTP Exceptions.
         """
-        base.FAULT_MAP.update({nsx_exc.InvalidNovaZone:
-                               webob.exc.HTTPBadRequest,
-                               nsx_exc.NoMorePortsException:
-                               webob.exc.HTTPBadRequest,
-                               nsx_exc.MaintenanceInProgress:
-                               webob.exc.HTTPServiceUnavailable,
-                               nsx_exc.InvalidSecurityCertificate:
-                               webob.exc.HTTPBadRequest})
+        faults.FAULT_MAP.update({nsx_exc.InvalidNovaZone:
+                                 webob.exc.HTTPBadRequest,
+                                 nsx_exc.NoMorePortsException:
+                                 webob.exc.HTTPBadRequest,
+                                 nsx_exc.MaintenanceInProgress:
+                                 webob.exc.HTTPServiceUnavailable,
+                                 nsx_exc.InvalidSecurityCertificate:
+                                 webob.exc.HTTPBadRequest})
 
     def _validate_provider_create(self, context, network):
         segments = network.get(mpnet.SEGMENTS)
diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py
index a3b959b5ca..2585256af7 100644
--- a/vmware_nsx/plugins/nsx_v3/plugin.py
+++ b/vmware_nsx/plugins/nsx_v3/plugin.py
@@ -18,6 +18,7 @@ from neutron_lib.api.definitions import availability_zone as az_def
 from neutron_lib.api.definitions import external_net as extnet_apidef
 from neutron_lib.api.definitions import network as net_def
 from neutron_lib.api.definitions import port_security as psec
+from neutron_lib.api import faults
 from neutron_lib.api.validators import availability_zone as az_validator
 from neutron_lib.exceptions import port_security as psec_exc
 from neutron_lib.services.qos import constants as qos_consts
@@ -25,7 +26,6 @@ from neutron_lib.services.qos import constants as qos_consts
 from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
 from neutron.api.rpc.handlers import dhcp_rpc
 from neutron.api.rpc.handlers import metadata_rpc
-from neutron.api.v2 import base
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron.db import _resource_extend as resource_extend
@@ -268,15 +268,14 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
         Exceptions specific to the NSX Plugin are mapped to standard
         HTTP Exceptions.
         """
-        base.FAULT_MAP.update({nsx_lib_exc.ManagerError:
-                               webob.exc.HTTPBadRequest,
-                               nsx_lib_exc.ServiceClusterUnavailable:
-                               webob.exc.HTTPServiceUnavailable,
-                               nsx_lib_exc.ClientCertificateNotTrusted:
-                               webob.exc.HTTPBadRequest,
-                               nsx_exc.SecurityGroupMaximumCapacityReached:
-                               webob.exc.HTTPBadRequest,
-                               })
+        faults.FAULT_MAP.update({nsx_lib_exc.ManagerError:
+                                 webob.exc.HTTPBadRequest,
+                                 nsx_lib_exc.ServiceClusterUnavailable:
+                                 webob.exc.HTTPServiceUnavailable,
+                                 nsx_lib_exc.ClientCertificateNotTrusted:
+                                 webob.exc.HTTPBadRequest,
+                                 nsx_exc.SecurityGroupMaximumCapacityReached:
+                                 webob.exc.HTTPBadRequest})
 
     def _init_fwaas(self, resource, event, trigger, **kwargs):
         self.fwaas_callbacks = None