diff options
| author | Eric Day <eday@oddments.org> | 2010-12-08 17:24:40 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-12-08 17:24:40 +0000 |
| commit | 67cbebdfcb57d4b81be65e54e4ed4a2201d4efa4 (patch) | |
| tree | c84a7aeeead2ecf5d65b5a7feac159010f1810a2 /nova/tests | |
| parent | 3bb38e64ed5144db00d77488243b6b70023a3c44 (diff) | |
| parent | 90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2 (diff) | |
| download | nova-67cbebdfcb57d4b81be65e54e4ed4a2201d4efa4.tar.gz nova-67cbebdfcb57d4b81be65e54e4ed4a2201d4efa4.tar.xz nova-67cbebdfcb57d4b81be65e54e4ed4a2201d4efa4.zip | |
Pushed terminate instance and network manager/topic methods into network.compute.api.
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 44ac8f342..46b9c5348 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -47,6 +47,14 @@ def return_security_group(context, instance_id, security_group_id): pass +def instance_update(context, instance_id, kwargs): + pass + + +def instance_address(context, instance_id): + return None + + def stub_instance(id, user_id=1): return Instance(id=id + 123456, state=0, image_id=10, user_id=user_id, display_name='server%s' % id, internal_id=id) @@ -69,6 +77,11 @@ class ServersTest(unittest.TestCase): return_servers) self.stubs.Set(nova.db.api, 'instance_add_security_group', return_security_group) + self.stubs.Set(nova.db.api, 'instance_update', instance_update) + self.stubs.Set(nova.db.api, 'instance_get_fixed_address', + instance_address) + self.stubs.Set(nova.db.api, 'instance_get_floating_address', + instance_address) def tearDown(self): self.stubs.UnsetAll() |