openstack
/
neutron
Code Issues Proposed changes

Merge "ofagent: Remove obsolete bridge_mappings (plugin side)"

This commit is contained in:
Jenkins 2014-11-28 22:21:32 +00:00 committed by Gerrit Code Review
parent 580ff42286 266d4e4c31
commit 88b893f37c
3 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/drivers/mech_ofagent.py
View File

@ -50,16 +50,13 @@ class OfagentMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
vif_details)
def check_segment_for_agent(self, segment, agent):
bridge_mappings = agent['configurations'].get('bridge_mappings', {})
interface_mappings = agent['configurations'].get('interface_mappings',
{})
tunnel_types = agent['configurations'].get('tunnel_types', [])
LOG.debug("Checking segment: %(segment)s "
"for bridge_mappings: %(bridge_mappings)s "
"and interface_mappings: %(interface_mappings)s "
"for interface_mappings: %(interface_mappings)s "
"with tunnel_types: %(tunnel_types)s",
{'segment': segment,
'bridge_mappings': bridge_mappings,
'interface_mappings': interface_mappings,
'tunnel_types': tunnel_types})
network_type = segment[api.NETWORK_TYPE]
@ -67,6 +64,5 @@ class OfagentMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
network_type == p_const.TYPE_LOCAL or
network_type in tunnel_types or
(network_type in [p_const.TYPE_FLAT, p_const.TYPE_VLAN] and
(segment[api.PHYSICAL_NETWORK] in bridge_mappings
or segment[api.PHYSICAL_NETWORK] in interface_mappings))
segment[api.PHYSICAL_NETWORK] in interface_mappings)
)

2
neutron/tests/unit/ml2/drivers/test_l2population.py
View File

@ -83,7 +83,7 @@ L2_AGENT_5 = {
'topic': constants.L2_AGENT_TOPIC,
'configurations': {'tunneling_ip': '20.0.0.5',
'tunnel_types': [],
'bridge_mappings': {'physnet1': 'br'},
'interface_mappings': {'physnet1': 'eth9'},
'l2pop_network_types': ['vlan']},
'agent_type': constants.AGENT_TYPE_OFA,
'tunnel_type': [],

64
neutron/tests/unit/ml2/drivers/test_ofagent_mech.py
View File

@ -92,67 +92,3 @@ class OfagentMechanismSGDisabledLocalTestCase(
OfagentMechanismSGDisabledBaseTestCase,
base.AgentMechanismLocalTestCase):
pass
# The following tests are for deprecated "bridge_mappings".
# TODO(yamamoto): Remove them.
class OfagentMechanismPhysBridgeTestCase(base.AgentMechanismBaseTestCase):
VIF_TYPE = portbindings.VIF_TYPE_OVS
VIF_DETAILS = {portbindings.CAP_PORT_FILTER: True,
portbindings.OVS_HYBRID_PLUG: True}
AGENT_TYPE = constants.AGENT_TYPE_OFA
GOOD_MAPPINGS = {'fake_physical_network': 'fake_bridge'}
GOOD_TUNNEL_TYPES = ['gre', 'vxlan']
GOOD_CONFIGS = {'bridge_mappings': GOOD_MAPPINGS,
'tunnel_types': GOOD_TUNNEL_TYPES}
BAD_MAPPINGS = {'wrong_physical_network': 'wrong_bridge'}
BAD_TUNNEL_TYPES = ['bad_tunnel_type']
BAD_CONFIGS = {'bridge_mappings': BAD_MAPPINGS,
'tunnel_types': BAD_TUNNEL_TYPES}
AGENTS = [{'alive': True,
'configurations': GOOD_CONFIGS}]
AGENTS_DEAD = [{'alive': False,
'configurations': GOOD_CONFIGS}]
AGENTS_BAD = [{'alive': False,
'configurations': GOOD_CONFIGS},
{'alive': True,
'configurations': BAD_CONFIGS}]
def setUp(self):
super(OfagentMechanismPhysBridgeTestCase, self).setUp()
self.driver = mech_ofagent.OfagentMechanismDriver()
self.driver.initialize()
class OfagentMechanismPhysBridgeGenericTestCase(
OfagentMechanismPhysBridgeTestCase,
base.AgentMechanismGenericTestCase):
pass
class OfagentMechanismPhysBridgeLocalTestCase(
OfagentMechanismPhysBridgeTestCase,
base.AgentMechanismLocalTestCase):
pass
class OfagentMechanismPhysBridgeFlatTestCase(
OfagentMechanismPhysBridgeTestCase,
base.AgentMechanismFlatTestCase):
pass
class OfagentMechanismPhysBridgeVlanTestCase(
OfagentMechanismPhysBridgeTestCase,
base.AgentMechanismVlanTestCase):
pass
class OfagentMechanismPhysBridgeGreTestCase(
OfagentMechanismPhysBridgeTestCase,
base.AgentMechanismGreTestCase):
pass