summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-03-09 21:24:56 +0000
committerTarmac <>2011-03-09 21:24:56 +0000
commita7a00129b1b91c8b66c73c9342ce541ec16f8570 (patch)
treef3eba5f1c6a71a22d01069dfea228dde945432e1 /nova/tests
parent5662a822a013bd0d159c15b990231c4d1f12797f (diff)
parenta9bd1b456332aaf5f6ab9942979485f2192b6f3e (diff)
downloadnova-a7a00129b1b91c8b66c73c9342ce541ec16f8570.tar.gz
nova-a7a00129b1b91c8b66c73c9342ce541ec16f8570.tar.xz
nova-a7a00129b1b91c8b66c73c9342ce541ec16f8570.zip
Update the create server call in the Openstack API so that it generates an 'adminPass' and calls set_admin_password in the compute API. This gets us closer to parity with the Cloud Servers v1.0 spec.
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_servers.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 4727a77d9..3739329f2 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -218,7 +218,7 @@ class ServersTest(test.TestCase):
def test_create_instance(self):
def instance_create(context, inst):
- return {'id': '1', 'display_name': ''}
+ return {'id': '1', 'display_name': 'server_test'}
def server_update(context, id, params):
return instance_create(context, id)
@@ -262,6 +262,12 @@ class ServersTest(test.TestCase):
res = req.get_response(fakes.wsgi_app())
+ server = json.loads(res.body)['server']
+ self.assertEqual('serv', server['adminPass'][:4])
+ self.assertEqual(16, len(server['adminPass']))
+ self.assertEqual('server_test', server['name'])
+ self.assertEqual('1', server['id'])
+
self.assertEqual(res.status_int, 200)
def test_update_no_body(self):