use common rpc and exceptions from neutron-lib

The neutron.common.rpc and exceptions were rehomed into neutron-lib and
are currently shimmed in neutron [1]

This patch consumes those modules from neutron-lib by using lib's
modules rather than neutrons.

[1] https://review.openstack.org/#/c/586525/

Change-Id: I18a697f1f2d8ddbd203f4435b4aab92a8b045a44

vmware_nsx/dhcp_meta/modes.py

@@ -19,6 +19,7 @@ import weakref
 
 from neutron_lib.agent import topics
 from neutron_lib import constants as const
+from neutron_lib import rpc as n_rpc
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -27,7 +28,6 @@ from oslo_utils import importutils
 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.common import rpc as n_rpc
 from neutron.db import agents_db
 
 from vmware_nsx._i18n import _

vmware_nsx/plugins/nsx_v/plugin.py

@@ -50,6 +50,7 @@ from neutron_lib.objects import registry as obj_reg
 from neutron_lib.plugins import constants as plugin_const
 from neutron_lib.plugins import directory
 from neutron_lib.plugins import utils
+from neutron_lib import rpc as n_rpc
 from neutron_lib.services.qos import constants as qos_consts
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -63,7 +64,6 @@ from sqlalchemy.orm import exc as sa_exc
 
 from neutron.api import extensions as neutron_extensions
 from neutron.common import ipv6_utils
-from neutron.common import rpc as n_rpc
 from neutron.common import utils as n_utils
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import agents_db

vmware_nsx/plugins/nsx_v3/plugin.py

@@ -32,12 +32,12 @@ from neutron_lib.exceptions import l3 as l3_exc
 from neutron_lib.exceptions import port_security as psec_exc
 from neutron_lib.plugins import constants as plugin_const
 from neutron_lib.plugins import directory
+from neutron_lib import rpc as n_rpc
 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.common import rpc as n_rpc
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import agents_db
 from neutron.db import agentschedulers_db

vmware_nsx/services/qos/common/utils.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.common import exceptions as n_exc
+from neutron_lib.exceptions import qos as qos_exc
 from neutron_lib.objects import registry as obj_reg
 from neutron_lib.services.qos import constants as qos_consts
 
@@ -25,7 +25,7 @@ def validate_policy_accessable(context, policy_id):
     if not policy_obj:
         # This means that rbac decided the policy cannot be used with this
         # context
-        raise n_exc.QosPolicyNotFound(policy_id=policy_id)
+        raise qos_exc.QosPolicyNotFound(policy_id=policy_id)
 
 
 def update_network_policy_binding(context, net_id, new_policy_id):

vmware_nsx/tests/unit/services/qos/test_nsxv3_notification.py

@@ -15,11 +15,11 @@
 import mock
 
 from neutron_lib import context
+from neutron_lib import exceptions
 from neutron_lib.objects import registry as obj_reg
 from oslo_config import cfg
 from oslo_utils import uuidutils
 
-from neutron.common import exceptions
 from neutron.objects import base as base_object
 from neutron.services.qos import qos_plugin
 from neutron.tests.unit.services.qos import base