summaryrefslogtreecommitdiffstats
path: root/nova/adminclient.py
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2010-08-02 16:37:29 +0000
committerTarmac <>2010-08-02 16:37:29 +0000
commit75c8ccaadedd59b8b7671c3802b8bcfd6368a998 (patch)
treefb953269a73bc73939a3a50aa36b9ad48c1b59b8 /nova/adminclient.py
parent1db9c94a78bcbefaaa59ee5ee0de4efe5fc1c790 (diff)
parent099feefbbd1f9b0db70f1a4bcc90da57f902af9d (diff)
Added project as parameter to admin client x509 zip file download.
Diffstat (limited to 'nova/adminclient.py')
-rw-r--r--nova/adminclient.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/nova/adminclient.py b/nova/adminclient.py
index fceeac274..25d5e71cb 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -292,9 +292,13 @@ class NovaAdminClient(object):
'Operation': operation}
return self.apiconn.get_status('ModifyProjectMember', params)
- def get_zip(self, username):
- """ returns the content of a zip file containing novarc and access credentials. """
- return self.apiconn.get_object('GenerateX509ForUser', {'Name': username}, UserInfo).file
+ def get_zip(self, user, project):
+ """
+ Returns the content of a zip file containing novarc and access credentials.
+ """
+ params = {'Name': user, 'Project': project}
+ zip = self.apiconn.get_object('GenerateX509ForUser', params, UserInfo)
+ return zip.file
def get_hosts(self):
return self.apiconn.get_list('DescribeHosts', {}, [('item', HostInfo)])