Merge lp:~rackspace-titan/nova/openstack-api-password-gen into lp:~hudson-openstack/nova/trunk

[Dan Prince]

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.

[Jay Pipes (jaypipes)]

Hi Dan!

You state in the commit message above this is for v1.0 parity, but the blueprint says this is for v1.1. Could you clarify? I was going to set the priority on the blueprint but need an answer on this question before I do...

Thanks!
-jay

[Josh Kearney (jk0)]

This looks good to me, but I want Ed to have a look before I approve since he worked on the XenAPI password injection.

[Dan Prince (dan-prince)]

Hey Jay. Just updated the Blueprint to say 1.0. This feature is in both 1.0 and 1.1.

[Jay Pipes (jaypipes)]

OK, thx Dan for the info. Set the blueprint to Medium priority. Code looks good from my end.

review: Approve

[Ed Leafe (ed-leafe)]

I'm not sure I'm following the flow correctly. You are generating a password in the API layer, but not passing it to the compute layer (just the server ID)? When it is handled by nova.compute.manager.set_admin_password(), won't that code simply re-generate another password?

review: Needs Information

[Dan Prince (dan-prince)]

Just talked to Ed and worked out the issue with the missing password parameter in the compute API.

The latest branch code should resolve that issue (Good catch Ed).

[Jay Pipes (jaypipes)]

Yup, looks good. FYI, Dan, for smallish changes like this last one, just set the merge proposal status to Work In Progress while you make the fix, then after pushing the code, just flip the MP status back to Needs Review. This will trigger a re-diffing and a notification to all prior reviewers to re-review. Just an FYI :)

review: Approve

[Ed Leafe (ed-leafe)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/api/openstack/servers.py'
--- nova/api/openstack/servers.py	2011-03-08 22:14:25 +0000
+++ nova/api/openstack/servers.py	2011-03-09 19:57:47 +0000
@@ -98,7 +98,7 @@
         'application/xml': {
             "attributes": {
                 "server": ["id", "imageId", "name", "flavorId", "hostId",
-                           "status", "progress"]}}}
+                           "status", "progress", "adminPass"]}}}
 
     def __init__(self):
         self.compute_api = compute.API()
@@ -178,7 +178,14 @@
             key_data=key_pair['public_key'],
             metadata=metadata,
             onset_files=env.get('onset_files', []))
-        return _translate_keys(instances[0])
+
+        server = _translate_keys(instances[0])
+        password = "%s%s" % (server['server']['name'][:4],
+                             utils.generate_password(12))
+        server['server']['adminPass'] = password
+        self.compute_api.set_admin_password(context, server['server']['id'],
+                                            password)
+        return server
 
     def update(self, req, id):
         """ Updates the server name or password """

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-03-04 17:20:28 +0000
+++ nova/compute/api.py	2011-03-09 19:57:47 +0000
@@ -498,9 +498,10 @@
         """Unrescue the given instance."""
         self._cast_compute_message('unrescue_instance', context, instance_id)
 
-    def set_admin_password(self, context, instance_id):
+    def set_admin_password(self, context, instance_id, password=None):
         """Set the root/admin password for the given instance."""
-        self._cast_compute_message('set_admin_password', context, instance_id)
+        self._cast_compute_message('set_admin_password', context, instance_id,
+                                    password)
 
     def inject_file(self, context, instance_id):
         """Write a file to the given instance."""

=== modified file 'nova/tests/api/openstack/test_servers.py'
--- nova/tests/api/openstack/test_servers.py	2011-03-07 20:26:35 +0000
+++ nova/tests/api/openstack/test_servers.py	2011-03-09 19:57:47 +0000
@@ -218,7 +218,7 @@
 
     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 @@
 
         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):