diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-29 03:56:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-29 03:56:34 +0000 |
| commit | ff9745c9527399df52f56b022a698cd63e48d537 (patch) | |
| tree | 3e086dcf659a176f0735ebab485cc70a1c50f05f | |
| parent | cedba17acf2db1072e5c6c0d4292a6c5166e2608 (diff) | |
| parent | 78a2ecb9923417f63c17c1e7055200ac97e6e947 (diff) | |
| download | neutron-ff9745c9527399df52f56b022a698cd63e48d537.tar.gz | |
Merge "Fix broken port query in Extraroute test case"
| -rw-r--r-- | neutron/tests/unit/test_db_plugin.py | 8 | ||||
| -rw-r--r-- | neutron/tests/unit/test_extension_extraroute.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py index 7754cc2b12..f6b8204886 100644 --- a/neutron/tests/unit/test_db_plugin.py +++ b/neutron/tests/unit/test_db_plugin.py @@ -368,10 +368,12 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase, def _list_ports(self, fmt, expected_res_status=None, net_id=None, **kwargs): - query_params = None + query_params = [] if net_id: - query_params = "network_id=%s" % net_id - port_req = self.new_list_request('ports', fmt, query_params) + query_params.append("network_id=%s" % net_id) + if kwargs.get('device_owner'): + query_params.append("device_owner=%s" % kwargs.get('device_owner')) + port_req = self.new_list_request('ports', fmt, '&'.join(query_params)) if ('set_context' in kwargs and kwargs['set_context'] is True and 'tenant_id' in kwargs): diff --git a/neutron/tests/unit/test_extension_extraroute.py b/neutron/tests/unit/test_extension_extraroute.py index f2fa6e3394..dad220370f 100644 --- a/neutron/tests/unit/test_extension_extraroute.py +++ b/neutron/tests/unit/test_extension_extraroute.py @@ -403,7 +403,7 @@ class ExtraRouteDBTestCaseBase(object): 200, s['subnet']['network_id'], tenant_id=r['router']['tenant_id'], - device_own=constants.DEVICE_OWNER_ROUTER_GW) + device_owner=constants.DEVICE_OWNER_ROUTER_GW) port_list = self.deserialize('json', port_res) self.assertEqual(len(port_list['ports']), 1) |