Merge lp:~devcamcar/nova/lp709632 into lp:~hudson-openstack/nova/trunk

[Devin Carlen]

Enabled modification of projects using the EC2 admin API.

Enables modification of projects using the EC2 admin API. All the interesting bits are already in the auth manager. This just exposes the methods over the admin API.

This change has very low impact, but these changes are high priority for the openstack-dashboard.

I am requesting a feature freeze exception for this patch.

[Rick Harris (rconradharris)]

Looks reasonable

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Thierry Carrez (ttx)]

Very self-contained, exception granted

review: Approve (gfe)

=== modified file 'nova/adminclient.py'
--- nova/adminclient.py	2011-01-30 23:45:17 +0000
+++ nova/adminclient.py	2011-01-31 19:42:34 +0000
@@ -381,6 +381,13 @@
                   'MemberUsers': member_users}
         return self.apiconn.get_object('RegisterProject', params, ProjectInfo)
 
+    def modify_project(self, projectname, manager_user=None, description=None):
+        """Modifies an existing project."""
+        params = {'Name': projectname,
+                  'ManagerUser': manager_user,
+                  'Description': description}
+        return self.apiconn.get_status('ModifyProject', params)
+
     def delete_project(self, projectname):
         """Permanently deletes the specified project."""
         return self.apiconn.get_object('DeregisterProject',

=== modified file 'nova/api/ec2/admin.py'
--- nova/api/ec2/admin.py	2011-01-26 00:40:23 +0000
+++ nova/api/ec2/admin.py	2011-01-31 19:42:34 +0000
@@ -184,6 +184,17 @@
                 description=None,
                 member_users=None))
 
+    def modify_project(self, context, name, manager_user, description=None,
+                       **kwargs):
+        """Modifies a project"""
+        msg = _("Modify project: %(name)s managed by"
+                " %(manager_user)s") % locals()
+        LOG.audit(msg, context=context)
+        manager.AuthManager().modify_project(name,
+                                             manager_user=manager_user,
+                                             description=description)
+        return True
+
     def deregister_project(self, context, name):
         """Permanently deletes a project."""
         LOG.audit(_("Delete project: %s"), name, context=context)