x/vmware-nsx
Code Issues Proposed changes

Merge "Remove unnecessary _make_port function in BSN UTs"

Browse Source
This commit is contained in:
Jenkins 2014-09-22 14:46:33 +00:00 committed by Gerrit Code Review
commit ec3d40cba1
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
neutron/tests/unit/bigswitch/test_restproxy_plugin.py
View File

@ -216,7 +216,8 @@ class TestBigSwitchProxyPortsV2(test_plugin.TestPortsV2,
def test_port_vif_details_override(self): def test_port_vif_details_override(self):
# ivshost is in the test config to override to IVS # ivshost is in the test config to override to IVS
kwargs = {'name': 'name', 'binding:host_id': 'ivshost', kwargs = {'name': 'name', 'binding:host_id': 'ivshost',
'device_id': 'override_dev'} 'device_id': 'override_dev',
'arg_list': ('binding:host_id',)}
with self.port(**kwargs) as port: with self.port(**kwargs) as port:
self.assertEqual(port['port']['binding:vif_type'], self.assertEqual(port['port']['binding:vif_type'],
portbindings.VIF_TYPE_IVS) portbindings.VIF_TYPE_IVS)
@ -238,18 +239,6 @@ class TestBigSwitchProxyPortsV2(test_plugin.TestPortsV2,
res = self.deserialize(self.fmt, req.get_response(self.api)) res = self.deserialize(self.fmt, req.get_response(self.api))
self.assertEqual(res['port']['binding:vif_type'], self.VIF_TYPE) self.assertEqual(res['port']['binding:vif_type'], self.VIF_TYPE)
def _make_port(self, fmt, net_id, expected_res_status=None, arg_list=None,
**kwargs):
arg_list = arg_list or ()
arg_list += ('binding:host_id', )
res = self._create_port(fmt, net_id, expected_res_status,
arg_list, **kwargs)
# Things can go wrong - raise HTTP exc with res code only
# so it can be caught by unit tests
if res.status_int >= 400:
raise webob.exc.HTTPClientError(code=res.status_int)
return self.deserialize(fmt, res)
class TestVifDifferentDefault(BigSwitchProxyPluginV2TestCase): class TestVifDifferentDefault(BigSwitchProxyPluginV2TestCase):

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

@ -18,7 +18,6 @@ import contextlib
import functools import functools
import mock import mock
import webob.exc
from neutron import context as neutron_context from neutron import context as neutron_context
from neutron.extensions import portbindings from neutron.extensions import portbindings
@ -80,18 +79,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')
def _make_port(self, fmt, net_id, expected_res_status=None, arg_list=None,
**kwargs):
arg_list = arg_list or ()
arg_list += ('binding:host_id', )
res = self._create_port(fmt, net_id, expected_res_status,
arg_list, **kwargs)
# Things can go wrong - raise HTTP exc with res code only
# so it can be caught by unit tests
if res.status_int >= 400:
raise webob.exc.HTTPClientError(code=res.status_int)
return self.deserialize(fmt, res)
def test_bind_ivs_port(self): def test_bind_ivs_port(self):
host_arg = {portbindings.HOST_ID: 'hostname'} host_arg = {portbindings.HOST_ID: 'hostname'}
with contextlib.nested( with contextlib.nested(
@ -152,7 +139,8 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
side_effect=servermanager.RemoteRestError( side_effect=servermanager.RemoteRestError(
reason=servermanager.NXNETWORK, status=404)), reason=servermanager.NXNETWORK, status=404)),
mock.patch(DRIVER + '._send_all_data'), mock.patch(DRIVER + '._send_all_data'),
self.port(**{'device_id': 'devid', 'binding:host_id': 'host'}) self.port(**{'device_id': 'devid', 'binding:host_id': 'host',
'arg_list': ('binding:host_id',)})
) as (mock_http, mock_send_all, p): ) as (mock_http, mock_send_all, p):
# wait for thread to finish # wait for thread to finish
mm = manager.NeutronManager.get_plugin().mechanism_manager mm = manager.NeutronManager.get_plugin().mechanism_manager
@ -191,7 +179,8 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
def test_backend_request_contents(self): def test_backend_request_contents(self):
with contextlib.nested( with contextlib.nested(
mock.patch(SERVER_POOL + '.rest_create_port'), mock.patch(SERVER_POOL + '.rest_create_port'),
self.port(**{'device_id': 'devid', 'binding:host_id': 'host'}) self.port(**{'device_id': 'devid', 'binding:host_id': 'host',
'arg_list': ('binding:host_id',)})
) as (mock_rest, p): ) as (mock_rest, p):
# make sure basic expected keys are present in the port body # make sure basic expected keys are present in the port body
pb = mock_rest.mock_calls[0][1][2] pb = mock_rest.mock_calls[0][1][2]