From e53caccb7a242bdabd4ea6aed914ab77cb1fca32 Mon Sep 17 00:00:00 2001 From: Devin Carlen Date: Wed, 28 Jul 2010 18:16:09 +0000 Subject: Fixed project api --- nova/adminclient.py | 6 +++++- nova/endpoint/admin.py | 1 + nova/endpoint/cloud.py | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'nova') diff --git a/nova/adminclient.py b/nova/adminclient.py index e81e0470f..7ef3497bc 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -69,6 +69,7 @@ class ProjectInfo(object): self.connection = connection self.projectname = projectname self.endpoint = endpoint + self.memberIds = [] def __repr__(self): return 'ProjectInfo:%s' % self.projectname @@ -77,7 +78,10 @@ class ProjectInfo(object): return None def endElement(self, name, value, connection): - setattr(self, name, str(value)) + if name == 'item': + self.memberIds.append(value) + elif name != 'memberIds': + setattr(self, name, str(value)) class HostInfo(object): """ diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py index e1e06e944..120396b4a 100644 --- a/nova/endpoint/admin.py +++ b/nova/endpoint/admin.py @@ -42,6 +42,7 @@ def project_dict(project): if project: return { 'projectname': project.id, + 'project_manager_id': project.project_manager_id, 'description': project.description, 'member_ids': project.member_ids } diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 76ca35320..754b0780c 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -49,8 +49,7 @@ flags.DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on') def _gen_key(user_id, key_name): """ Tuck this into AuthManager """ try: - manager = manager.AuthManager() - private_key, fingerprint = manager.generate_key_pair(user_id, key_name) + private_key, fingerprint = manager.AuthManager().generate_key_pair(user_id, key_name) except Exception as ex: return {'exception': ex} return {'private_key': private_key, 'fingerprint': fingerprint} -- cgit