From 87311b00884eeb75568a2c7d246872e4f90d8f2c Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Tue, 18 Nov 2014 01:42:34 -0800 Subject: BSN: include missing data in floating IP call Includes some missing floating IP data in an optimized floating IP API that was previously unused. Closes-Bug: #1394030 Change-Id: Icba2f837dbc3838f86d125d261b5e2325000c618 (cherry picked from commit 55a031e624f347d346d1909afec75482950d123c) --- neutron/plugins/bigswitch/servermanager.py | 4 ++-- neutron/tests/unit/bigswitch/test_servermanager.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py index c10ce72bb5..992bfc7906 100644 --- a/neutron/plugins/bigswitch/servermanager.py +++ b/neutron/plugins/bigswitch/servermanager.py @@ -578,12 +578,12 @@ class ServerPool(object): def rest_create_floatingip(self, tenant_id, floatingip): resource = FLOATINGIPS_PATH % (tenant_id, floatingip['id']) errstr = _("Unable to create floating IP: %s") - self.rest_action('PUT', resource, errstr=errstr) + self.rest_action('PUT', resource, floatingip, errstr=errstr) def rest_update_floatingip(self, tenant_id, floatingip, oldid): resource = FLOATINGIPS_PATH % (tenant_id, oldid) errstr = _("Unable to update floating IP: %s") - self.rest_action('PUT', resource, errstr=errstr) + self.rest_action('PUT', resource, floatingip, errstr=errstr) def rest_delete_floatingip(self, tenant_id, oldid): resource = FLOATINGIPS_PATH % (tenant_id, oldid) diff --git a/neutron/tests/unit/bigswitch/test_servermanager.py b/neutron/tests/unit/bigswitch/test_servermanager.py index e8d15efa3b..be60dbca0f 100644 --- a/neutron/tests/unit/bigswitch/test_servermanager.py +++ b/neutron/tests/unit/bigswitch/test_servermanager.py @@ -445,13 +445,17 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase): def test_floating_calls(self): pl = manager.NeutronManager.get_plugin() with mock.patch(SERVERMANAGER + '.ServerPool.rest_action') as ramock: - pl.servers.rest_create_floatingip('tenant', {'id': 'somefloat'}) - pl.servers.rest_update_floatingip('tenant', {'name': 'myfl'}, 'id') + body1 = {'id': 'somefloat'} + body2 = {'name': 'myfl'} + pl.servers.rest_create_floatingip('tenant', body1) + pl.servers.rest_update_floatingip('tenant', body2, 'id') pl.servers.rest_delete_floatingip('tenant', 'oldid') ramock.assert_has_calls([ mock.call('PUT', '/tenants/tenant/floatingips/somefloat', + body1, errstr=u'Unable to create floating IP: %s'), mock.call('PUT', '/tenants/tenant/floatingips/id', + body2, errstr=u'Unable to update floating IP: %s'), mock.call('DELETE', '/tenants/tenant/floatingips/oldid', errstr=u'Unable to delete floating IP: %s') -- cgit v1.2.1