summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2012-01-16 17:02:31 -0800
committertermie <github@anarkystic.com>2012-01-16 17:02:31 -0800
commitdae746d9b779905c95efddcea066771bcddf1dad (patch)
tree3c3d79a724b68d66ced63481669d9f24a67c1866
parenta0c7c7ce5104075bdf85d9e53e8382c5bb22cc92 (diff)
add keystoneclient expected format
-rw-r--r--keystone/service.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/service.py b/keystone/service.py
index aed3b929..138b8621 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -436,18 +436,18 @@ class Ec2Controller(Application):
'access': uuid.uuid4().hex,
'secret': uuid.uuid4().hex}
self.ec2_api.create_credential(context, cred_ref['access'], cred_ref)
- return cred_ref
+ return {'credential': cred_ref}
def get_credentials(self, context, user_id):
"""List credentials for the given user_id."""
# TODO(termie): validate that this request is valid for given user
# tenant
- return self.ec2_api.list_credentials(user_id)
+ return {'credentials': self.ec2_api.list_credentials(user_id)}
def get_credential(self, context, user_id, credential_id):
# TODO(termie): validate that this request is valid for given user
# tenant
- return self.ec2_api.get_credential(credential_id)
+ return {'credential': self.ec2_api.get_credential(credential_id)}
def delete_credential(self, context, user_id, credential_id):
# TODO(termie): validate that this request is valid for given user