diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-07-15 16:37:20 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-07-15 16:37:20 -0400 |
| commit | ae7bd07b67b8d7feedbe01a62ebabca217473f13 (patch) | |
| tree | 3b2a61ac7f0192800196fdcb93de307aee89faa5 | |
| parent | 910dd2124123d8e1989ce85d57bcc2a245e39683 (diff) | |
got rid of return_server_with_interfaces and added return_server_with_attributes
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index c0ccb3ef2..eee0cbba0 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -78,16 +78,16 @@ def return_virtual_interface_instance_nonexistant(interfaces): return _return_virtual_interface_by_instance -def return_server_with_addresses(private, public): +def return_server_with_attributes(**kwargs): def _return_server(context, id): - return stub_instance(id, private_address=private, - public_addresses=public) + return stub_instance(id, **kwargs) return _return_server -def return_server_with_interfaces(interfaces, **kwargs): +def return_server_with_addresses(private, public): def _return_server(context, id): - return stub_instance(id, interfaces=interfaces, **kwargs) + return stub_instance(id, private_address=private, + public_addresses=public) return _return_server @@ -325,7 +325,7 @@ class ServersTest(test.TestCase): ], }, ] - new_return_server = return_server_with_interfaces(interfaces) + new_return_server = return_server_with_attributes(interfaces=interfaces) self.stubs.Set(nova.db.api, 'instance_get', new_return_server) req = webob.Request.blank('/v1.1/servers/1') @@ -414,7 +414,7 @@ class ServersTest(test.TestCase): ], }, ] - new_return_server = return_server_with_interfaces(interfaces, + new_return_server = return_server_with_attributes(interfaces=interfaces, power_state=1) self.stubs.Set(nova.db.api, 'instance_get', new_return_server) @@ -504,7 +504,7 @@ class ServersTest(test.TestCase): ], }, ] - new_return_server = return_server_with_interfaces(interfaces, + new_return_server = return_server_with_attributes(interfaces=interfaces, power_state=1, image_ref=image_ref, flavor_id=flavor_id) @@ -704,7 +704,7 @@ class ServersTest(test.TestCase): ], }, ] - new_return_server = return_server_with_interfaces(interfaces) + new_return_server = return_server_with_attributes(interfaces=interfaces) self.stubs.Set(nova.db.api, 'instance_get', new_return_server) req = webob.Request.blank('/v1.1/servers/1') |