Remove unnecessary _make_port function in BSN UTs

The Big Switch unit tests had unnecessary copies of the
_make_port function to allow the binding:host_id field to
be set. This was already possible with the existing _make_port
call through the use of kwargs so the extra function wasn't
necessary.

Change-Id: I88679173117739f628ae289636b5cdea10417e6c

diff --git a/neutron/tests/unit/bigswitch/test_restproxy_plugin.py b/neutron/tests/unit/bigswitch/test_restproxy_plugin.py
index 3d9a93d44cd9f6c4ecdcf5388b63e6391827b9cc..4d1845fce9a3096061adc731981d6a7160cd4cc3 100644 (file)
--- a/neutron/tests/unit/bigswitch/test_restproxy_plugin.py
+++ b/neutron/tests/unit/bigswitch/test_restproxy_plugin.py
@@ -216,7 +216,8 @@ class TestBigSwitchProxyPortsV2(test_plugin.TestPortsV2,
     def test_port_vif_details_override(self):
         # ivshost is in the test config to override to IVS
         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:
             self.assertEqual(port['port']['binding:vif_type'],
                              portbindings.VIF_TYPE_IVS)
@@ -238,18 +239,6 @@ class TestBigSwitchProxyPortsV2(test_plugin.TestPortsV2,
             res = self.deserialize(self.fmt, req.get_response(self.api))
             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):
 

diff --git a/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py b/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py
index 127a5a95bed4ce7c66798af116b161c658d6a8b3..4177f2e684e175d67ec80b16c09c1e71b0fb4742 100644 (file)
--- a/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py
+++ b/neutron/tests/unit/ml2/drivers/test_bigswitch_mech.py
@@ -18,7 +18,6 @@ import contextlib
 import functools
 
 import mock
-import webob.exc
 
 from neutron import context as neutron_context
 from neutron.extensions import portbindings
@@ -80,18 +79,6 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
             self.assertEqual(port['port']['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):
         host_arg = {portbindings.HOST_ID: 'hostname'}
         with contextlib.nested(
@@ -152,7 +139,8 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
                        side_effect=servermanager.RemoteRestError(
                            reason=servermanager.NXNETWORK, status=404)),
             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):
             # wait for thread to finish
             mm = manager.NeutronManager.get_plugin().mechanism_manager
@@ -191,7 +179,8 @@ class TestBigSwitchMechDriverPortsV2(test_db_plugin.TestPortsV2,
     def test_backend_request_contents(self):
         with contextlib.nested(
             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):
             # make sure basic expected keys are present in the port body
             pb = mock_rest.mock_calls[0][1][2]