From f297a78ede3e9736f80cb0daebe3d239b3371046 Mon Sep 17 00:00:00 2001 From: Boden R Date: Tue, 27 Jun 2017 13:03:38 -0600 Subject: [PATCH] use service type constants from neutron_lib plugins The well known service type constants are in neutron_lib.plugins.constants, but for legacy reasons a few still exist and are referenced from neutron_lib.constants [1] that we'd like to remove. This patch switches references over to neutron_lib's plugin constants. [1] https://github.com/openstack/neutron-lib/blob/master/neutron_lib/constants.py#L353 Change-Id: I33cf47ee37a4c36458d1c4bb740bb5f33c67d650 --- neutron_fwaas/services/firewall/fwaas_plugin.py | 5 +++-- .../tests/unit/services/firewall/test_fwaas_plugin.py | 5 +++-- .../tests/unit/services/firewall/test_fwaas_plugin_v2.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/neutron_fwaas/services/firewall/fwaas_plugin.py b/neutron_fwaas/services/firewall/fwaas_plugin.py index cc86ae6c1..9553b373c 100644 --- a/neutron_fwaas/services/firewall/fwaas_plugin.py +++ b/neutron_fwaas/services/firewall/fwaas_plugin.py @@ -14,6 +14,7 @@ # under the License. from neutron_lib import constants as nl_constants from neutron_lib import context as neutron_context +from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory from neutron.common import rpc as n_rpc @@ -173,7 +174,7 @@ class FirewallPlugin( def _get_hosts_to_notify(self, context, router_ids): """Returns all hosts to send notification about firewall update""" - l3_plugin = directory.get_plugin(nl_constants.L3) + l3_plugin = directory.get_plugin(plugin_constants.L3) no_broadcast = ( n_utils.is_extension_supported( l3_plugin, nl_constants.L3_AGENT_SCHEDULER_EXT_ALIAS) and @@ -236,7 +237,7 @@ class FirewallPlugin( if router_ids == nl_constants.ATTR_NOT_SPECIFIED: # old semantics router-ids keyword not specified pick up # all routers on tenant. - l3_plugin = directory.get_plugin(nl_constants.L3) + l3_plugin = directory.get_plugin(plugin_constants.L3) ctx = neutron_context.get_admin_context() routers = l3_plugin.get_routers(ctx) router_ids = [ diff --git a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py index 5ff212bd4..ecac27896 100644 --- a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py +++ b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin.py @@ -39,6 +39,7 @@ from neutron_fwaas.tests.unit.db.firewall import ( from neutron_lib.api import attributes as attr from neutron_lib import constants as nl_constants from neutron_lib import context +from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory extensions_path = neutron_fwaas.extensions.__path__[0] @@ -94,7 +95,7 @@ class TestFirewallRouterInsertionBase( self.setup_notification_driver() - self.l3_plugin = directory.get_plugin(nl_constants.L3) + self.l3_plugin = directory.get_plugin(plugin_constants.L3) self.plugin = directory.get_plugin('FIREWALL') self.callbacks = self.plugin.endpoints[0] @@ -748,7 +749,7 @@ class TestFirewallRouterPluginBase(test_db_firewall.FirewallPluginDbTestCase, app = config.load_paste_app('extensions_test_app') self.ext_api = api_ext.ExtensionMiddleware(app, ext_mgr=ext_mgr) - self.l3_plugin = directory.get_plugin(nl_constants.L3) + self.l3_plugin = directory.get_plugin(plugin_constants.L3) self.plugin = directory.get_plugin('FIREWALL') def test_get_firewall_tenant_ids_on_host_with_associated_router(self): diff --git a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin_v2.py b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin_v2.py index 13a9d9112..edd21b9e9 100644 --- a/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin_v2.py +++ b/neutron_fwaas/tests/unit/services/firewall/test_fwaas_plugin_v2.py @@ -27,6 +27,7 @@ from neutron_fwaas.tests.unit.db.firewall.v2 import ( test_firewall_db_v2 as test_db_firewall) from neutron_lib import constants as nl_constants from neutron_lib import context +from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory extensions_path = neutron_fwaas.extensions.__path__[0] @@ -110,7 +111,7 @@ class TestFirewallRouterPortBase( self.setup_notification_driver() - self.l3_plugin = directory.get_plugin(nl_constants.L3) + self.l3_plugin = directory.get_plugin(plugin_constants.L3) self.plugin = directory.get_plugin('FIREWALL_V2') self.callbacks = self.plugin.endpoints[0]