OpenStack Compute (nova)

Merge lp:~devcamcar/nova/admin-project-zip into lp:~hudson-openstack/nova/trunk

  1. admin-project-zip
  2. Merge into trunk
Proposed by Devin Carlen
Status: Merged
Approved by: Vish Ishaya
Approved revision: 199
Merge reported by: OpenStack Infra
Merged at revision: not available
Proposed branch: lp:~devcamcar/nova/admin-project-zip
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 20 lines (+7/-3)
1 file modified
nova/adminclient.py (+7/-3)
To merge this branch: bzr merge lp:~devcamcar/nova/admin-project-zip
Reviewer Review Type Date Requested Status
Todd Willey (community) Approve
Vish Ishaya (community) Approve
Review via email: mp+31342@code.launchpad.net

Commit message

Added project as parameter to admin client x509 zip file download.

Description of the change

Made admin client use project as a parameter for downloading x509 zip file.

To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve
Revision history for this message
Todd Willey (xtoddx) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/adminclient.py'
2--- nova/adminclient.py 2010-07-28 23:41:43 +0000
3+++ nova/adminclient.py 2010-07-30 00:21:41 +0000
4@@ -292,9 +292,13 @@
5 'Operation': operation}
6 return self.apiconn.get_status('ModifyProjectMember', params)
7
8- def get_zip(self, username):
9- """ returns the content of a zip file containing novarc and access credentials. """
10- return self.apiconn.get_object('GenerateX509ForUser', {'Name': username}, UserInfo).file
11+ def get_zip(self, user, project):
12+ """
13+ Returns the content of a zip file containing novarc and access credentials.
14+ """
15+ params = {'Name': user, 'Project': project}
16+ zip = self.apiconn.get_object('GenerateX509ForUser', params, UserInfo)
17+ return zip.file
18
19 def get_hosts(self):
20 return self.apiconn.get_list('DescribeHosts', {}, [('item', HostInfo)])