diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-04 10:16:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-04 10:16:17 +0000 |
| commit | f42897ce3747d91d7f5c309934de34eb966dc0d2 (patch) | |
| tree | 506d7b498729f02012c0cc928b7bb01c9da86c29 | |
| parent | 80e21c76626650c163f427d67852bde323cbcdbc (diff) | |
| parent | 489af71a6b976e5aabf7fcc8b1919f812dadf1c7 (diff) | |
| download | horizon-f42897ce3747d91d7f5c309934de34eb966dc0d2.tar.gz | |
Merge "Fix tenant floating_ip_allocation call in neutron rest api." into stable/stein
| -rw-r--r-- | openstack_dashboard/api/rest/network.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/test/unit/api/rest/test_network.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openstack_dashboard/api/rest/network.py b/openstack_dashboard/api/rest/network.py index bf7872be4..8bdebb9c7 100644 --- a/openstack_dashboard/api/rest/network.py +++ b/openstack_dashboard/api/rest/network.py @@ -67,7 +67,7 @@ class FloatingIP(generic.View): if 'dns_name' in request.DATA: params['dns_name'] = request.DATA['dns_name'] result = api.neutron.tenant_floating_ip_allocate(request, pool, - None, params) + None, **params) return result.to_dict() @rest_utils.ajax(data_required=True) diff --git a/openstack_dashboard/test/unit/api/rest/test_network.py b/openstack_dashboard/test/unit/api/rest/test_network.py index 05d30f0ff..4b2b9f6b6 100644 --- a/openstack_dashboard/test/unit/api/rest/test_network.py +++ b/openstack_dashboard/test/unit/api/rest/test_network.py @@ -77,7 +77,7 @@ class RestNetworkApiFloatingIpTests(test.TestCase): self.mock_tenant_floating_ip_allocate.assert_called_once_with(request, 'pool', None, - {}) + **{}) @test.create_mocks({api.neutron: ['floating_ip_associate']}) def test_associate_floating_ip(self): |