diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-06 14:27:48 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-06 14:27:48 -0700 |
| commit | e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b (patch) | |
| tree | 74f9692816affffedab0d03e9fba44fc75112d2f /nova/adminclient.py | |
| parent | 024ad9951dcf33f5a3468e9a790f1636770b2837 (diff) | |
| parent | 85b73194c2f8432a7e9ab5d24574746f209846ee (diff) | |
| download | nova-e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b.tar.gz nova-e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b.tar.xz nova-e6e5c8e0680b2aa8a243c3f82bcac8e484f78e3b.zip | |
merged trunk
Diffstat (limited to 'nova/adminclient.py')
| -rw-r--r-- | nova/adminclient.py | 10 |
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)]) |