Removing adv svcs dependencies on neutron

After upstreaming Idcfeee6ddc2982fff49f44064c918bfd4627be12 and
I62bfd6b34c381427425ca2a656e5782087de3a3b, we can remove items
from Neutron.

Specifically, LOADBALANCER_PLUGIN and LOADBALANCER_AGENT are not
used now. FIREWALL_PLUGIN is used in one module, so moved there.
The LOADBALANCER constant is only used in test files, but it is
used in multiple files, so leaving it. LOADBALANCERV2 is only used
in the header it is defined, so leaving it as well.

In the FW and LB repos, there are no longer dependency on these literals.

Change-Id: I7f0b972e1ae7ef435a3612e239dad7b2c04baea2
Implements: blueprint neutron-lib

diff --git a/neutron/common/topics.py b/neutron/common/topics.py
index b8993aa8ffda3f9587d747cafae1c212450bbb8b..15b8d7c3e6eeb0b743f1b0d7fa5ee0c05f85fdc8 100644 (file)
--- a/neutron/common/topics.py
+++ b/neutron/common/topics.py
@@ -30,14 +30,11 @@ PLUGIN = 'q-plugin'
 L3PLUGIN = 'q-l3-plugin'
 REPORTS = 'q-reports-plugin'
 DHCP = 'q-dhcp-notifer'
-FIREWALL_PLUGIN = 'q-firewall-plugin'
 METERING_PLUGIN = 'q-metering-plugin'
-LOADBALANCER_PLUGIN = 'n-lbaas-plugin'
 
 L3_AGENT = 'l3_agent'
 DHCP_AGENT = 'dhcp_agent'
 METERING_AGENT = 'metering_agent'
-LOADBALANCER_AGENT = 'n-lbaas_agent'
 
 RESOURCE_TOPIC_PATTERN = "neutron-vo-%(resource_type)s-%(version)s"
 

diff --git a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py
index 51f35ca9fb4c4b6d59276959a054601cd844351f..6980364b633d24bed8333097c5c6bfffefa41182 100644 (file)
--- a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py
+++ b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py
@@ -20,12 +20,12 @@ from oslo_utils import importutils
 from neutron._i18n import _, _LE
 from neutron.agent.linux import ip_lib
 from neutron.common import exceptions as nexception
-from neutron.common import topics
 from neutron import context
 from neutron.plugins.common import constants
 from neutron.services.firewall.agents import firewall_agent_api as api
 from neutron.services import provider_configuration as provconf
 
+FIREWALL_PLUGIN = 'q-firewall-plugin'
 LOG = logging.getLogger(__name__)
 
 
@@ -81,8 +81,7 @@ class FWaaSL3AgentRpcCallback(api.FWaaSAgentRpcCallbackMixin):
                 raise ImportError(msg % fwaas_driver_class_path)
         self.services_sync = False
         # setup RPC to msg fwaas plugin
-        self.fwplugin_rpc = FWaaSL3PluginApi(topics.FIREWALL_PLUGIN,
-                                             conf.host)
+        self.fwplugin_rpc = FWaaSL3PluginApi(FIREWALL_PLUGIN, conf.host)
         super(FWaaSL3AgentRpcCallback, self).__init__(host=conf.host)
 
     def _get_router_info_list_for_tenant(self, routers, tenant_id):