x/vmware-nsx
Code Issues Proposed changes

Merge "BigSwitch ML2: Include bound_segment in port"

Browse Source
This commit is contained in:
Jenkins 2014-03-21 05:54:39 +00:00 committed by Gerrit Code Review
commit 18ef3c9435
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/plugins/ml2/drivers/mech_bigswitch/driver.py
View File

@ -100,6 +100,7 @@ class BigSwitchMechanismDriver(NeutronRestProxyV2Base,
net = context.network.current net = context.network.current
port['network'] = net port['network'] = net
port['binding_host'] = context._binding.host port['binding_host'] = context._binding.host
port['bound_segment'] = context.bound_segment
actx = ctx.get_admin_context() actx = ctx.get_admin_context()
if (portbindings.HOST_ID in port and 'id' in port): if (portbindings.HOST_ID in port and 'id' in port):
host_id = port[portbindings.HOST_ID] host_id = port[portbindings.HOST_ID]

11
neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py
View File

@ -109,3 +109,14 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
) )
]) ])
self.spawn_p.start() self.spawn_p.start()
def test_backend_request_contents(self):
with nested(
mock.patch(SERVER_POOL + '.rest_create_port'),
self.port(**{'device_id': 'devid', 'binding:host_id': 'host'})
) as (mock_rest, p):
# make sure basic expected keys are present in the port body
pb = mock_rest.mock_calls[0][1][2]
self.assertEqual('host', pb['binding_host'])
self.assertIn('bound_segment', pb)
self.assertIn('network', pb)