openstack/neutron
Code Issues Proposed changes

COMMON_PREFIXES cleanup - patch 1/5

Browse Source 
This dictionary does not belong to the plugins directory as it captures
API business, but practically speaking it does not even deserve to exist
and can be removed altogether.

This is patch one in a series that aims at addressing this monkey business.

Change-Id: I95cd71dfc35e266f6f3cc5715ab8a0deb10058e7
This commit is contained in:
armando-migliaccio 2015-07-02 12:06:05 -07:00
parent 9aaa2befde
commit 59ae35ba8f
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/common/constants.py
View File

@ -35,14 +35,10 @@ EXT_TO_SERVICE_MAPPING = {
} }
COMMON_PREFIXES = { COMMON_PREFIXES = {
CORE: "",
DUMMY: "/dummy_svc",
LOADBALANCER: "/lb", LOADBALANCER: "/lb",
LOADBALANCERV2: "/lbaas", LOADBALANCERV2: "/lbaas",
FIREWALL: "/fw", FIREWALL: "/fw",
VPN: "/vpn", VPN: "/vpn",
METERING: "/metering",
L3_ROUTER_NAT: "",
} }
# Service operation status constants # Service operation status constants

1
neutron/services/metering/metering_plugin.py
View File

@ -22,6 +22,7 @@ from neutron.db.metering import metering_rpc
class MeteringPlugin(metering_db.MeteringDbMixin): class MeteringPlugin(metering_db.MeteringDbMixin):
"""Implementation of the Neutron Metering Service Plugin.""" """Implementation of the Neutron Metering Service Plugin."""
supported_extension_aliases = ["metering"] supported_extension_aliases = ["metering"]
path_prefix = "/metering"
def __init__(self): def __init__(self):
super(MeteringPlugin, self).__init__() super(MeteringPlugin, self).__init__()

2
neutron/tests/unit/db/metering/test_metering_db.py
View File

@ -114,7 +114,7 @@ class MeteringPluginDbTestCase(
fmt = 'json' fmt = 'json'
resource_prefix_map = dict( resource_prefix_map = dict(
(k.replace('_', '-'), constants.COMMON_PREFIXES[constants.METERING]) (k.replace('_', '-'), "/metering")
for k in metering.RESOURCE_ATTRIBUTE_MAP.keys() for k in metering.RESOURCE_ATTRIBUTE_MAP.keys()
) )

1
neutron/tests/unit/dummy_plugin.py
View File

@ -88,6 +88,7 @@ class DummyServicePlugin(service_base.ServicePluginBase):
""" """
supported_extension_aliases = ['dummy', servicetype.EXT_ALIAS] supported_extension_aliases = ['dummy', servicetype.EXT_ALIAS]
path_prefix = "/dummy_svc"
agent_notifiers = {'dummy': 'dummy_agent_notifier'} agent_notifiers = {'dummy': 'dummy_agent_notifier'}
def __init__(self): def __init__(self):

6
neutron/tests/unit/services/metering/test_metering_plugin.py
View File

@ -62,7 +62,7 @@ class TestMeteringPlugin(test_db_base_plugin_v2.NeutronDbPluginV2TestCase,
test_metering_db.MeteringPluginDbTestCaseMixin): test_metering_db.MeteringPluginDbTestCaseMixin):
resource_prefix_map = dict( resource_prefix_map = dict(
(k.replace('_', '-'), constants.COMMON_PREFIXES[constants.METERING]) (k.replace('_', '-'), "/metering")
for k in ext_metering.RESOURCE_ATTRIBUTE_MAP.keys() for k in ext_metering.RESOURCE_ATTRIBUTE_MAP.keys()
) )
@ -281,7 +281,7 @@ class TestMeteringPluginL3AgentScheduler(
test_metering_db.MeteringPluginDbTestCaseMixin): test_metering_db.MeteringPluginDbTestCaseMixin):
resource_prefix_map = dict( resource_prefix_map = dict(
(k.replace('_', '-'), constants.COMMON_PREFIXES[constants.METERING]) (k.replace('_', '-'), "/metering")
for k in ext_metering.RESOURCE_ATTRIBUTE_MAP.keys() for k in ext_metering.RESOURCE_ATTRIBUTE_MAP.keys()
) )
@ -404,7 +404,7 @@ class TestMeteringPluginRpcFromL3Agent(
test_metering_db.MeteringPluginDbTestCaseMixin): test_metering_db.MeteringPluginDbTestCaseMixin):
resource_prefix_map = dict( resource_prefix_map = dict(
(k.replace('_', '-'), constants.COMMON_PREFIXES[constants.METERING]) (k.replace('_', '-'), "/metering")
for k in ext_metering.RESOURCE_ATTRIBUTE_MAP for k in ext_metering.RESOURCE_ATTRIBUTE_MAP
) )