summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorIlya Alekseyev <ilyaalekseyev@acm.org>2011-06-27 16:33:01 +0400
committerIlya Alekseyev <ilyaalekseyev@acm.org>2011-06-27 16:33:01 +0400
commitef1f4d33fa5763ea602c2fc1098a4b230b86e82b (patch)
tree633297f435798bf420ce0094fae803190a797b05 /nova/tests
parentfd3da28b567a66a31f2833a3c00d0b6ccf55eed8 (diff)
review issues fixed
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/contrib/test_floating_ips.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py
index 4e26994dd..4a74861bd 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/contrib/test_floating_ips.py
@@ -28,12 +28,12 @@ from nova.api.openstack.contrib.floating_ips import FloatingIPController
from nova.api.openstack.contrib.floating_ips import _translate_floating_ip_view
-def network_api_get(self, context, id):
+def network_api_get_floating_ip(self, context, id):
return {'id': 1, 'address': '10.10.10.10',
'fixed_ip': {'address': '11.0.0.1'}}
-def network_api_list(self, context):
+def network_api_list_floating_ips(self, context):
return [{'id': 1,
'address': '10.10.10.10',
'instance': {'id': 11},
@@ -80,10 +80,10 @@ class FloatingIpTest(test.TestCase):
fakes.stub_out_networking(self.stubs)
fakes.stub_out_rate_limiting(self.stubs)
fakes.stub_out_auth(self.stubs)
- self.stubs.Set(network.api.API, "get",
- network_api_get)
- self.stubs.Set(network.api.API, "list",
- network_api_list)
+ self.stubs.Set(network.api.API, "get_floating_ip",
+ network_api_get_floating_ip)
+ self.stubs.Set(network.api.API, "list_floating_ips",
+ network_api_list_floating_ips)
self.stubs.Set(network.api.API, "allocate_floating_ip",
network_api_allocate)
self.stubs.Set(network.api.API, "release_floating_ip",