x/vmware-nsx
Code Issues Proposed changes

Merge "ML2 BigSwitch: Don't modify parent context"

Browse Source
This commit is contained in:
Jenkins 2014-03-20 15:44:57 +00:00 committed by Gerrit Code Review
commit 0a23528ca7
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
# #
# @author: Sumit Naiksatam, sumitnaiksatam@gmail.com, Big Switch Networks, Inc. # @author: Sumit Naiksatam, sumitnaiksatam@gmail.com, Big Switch Networks, Inc.
# @author: Kevin Benton, Big Switch Networks, Inc. # @author: Kevin Benton, Big Switch Networks, Inc.
import copy
import eventlet import eventlet
from oslo.config import cfg from oslo.config import cfg
@ -94,7 +95,8 @@ class BigSwitchMechanismDriver(NeutronRestProxyV2Base,
self.servers.rest_delete_port(net["tenant_id"], net["id"], port['id']) self.servers.rest_delete_port(net["tenant_id"], net["id"], port['id'])
def _prepare_port_for_controller(self, context): def _prepare_port_for_controller(self, context):
port = context.current # make a copy so the context isn't changed for other drivers
port = copy.deepcopy(context.current)
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

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

@ -75,18 +75,6 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
self.assertEqual(port['port']['status'], 'DOWN') self.assertEqual(port['port']['status'], 'DOWN')
self.assertEqual(self.port_create_status, 'DOWN') self.assertEqual(self.port_create_status, 'DOWN')
# exercise the host_id tracking code
def test_port_vif_details(self):
kwargs = {'name': 'name', 'binding:host_id': 'ivshost',
'device_id': 'override_dev'}
with self.port(**kwargs) as port:
self.assertEqual(port['port']['binding:vif_type'],
portbindings.VIF_TYPE_IVS)
kwargs = {'name': 'name2', 'binding:host_id': 'someotherhost',
'device_id': 'other_dev'}
with self.port(**kwargs) as port:
self.assertEqual(port['port']['binding:vif_type'], self.VIF_TYPE)
def _make_port(self, fmt, net_id, expected_res_status=None, arg_list=None, def _make_port(self, fmt, net_id, expected_res_status=None, arg_list=None,
**kwargs): **kwargs):
arg_list = arg_list or () arg_list = arg_list or ()