summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2011-11-14 10:23:05 -0800
committertermie <github@anarkystic.com>2011-11-14 10:23:05 -0800
commit2c7770fc0d1ef0f55a2e96c8ef6086a2f7d29937 (patch)
tree7c66e2726d55cc494032f134f993b40b103a459e
parent2d154828e7564f4025436d40cd5183c5f93b4273 (diff)
downloadkeystone-2c7770fc0d1ef0f55a2e96c8ef6086a2f7d29937.tar.gz
keystone-2c7770fc0d1ef0f55a2e96c8ef6086a2f7d29937.tar.xz
keystone-2c7770fc0d1ef0f55a2e96c8ef6086a2f7d29937.zip
add test for create user and get user
-rw-r--r--keystonelight/identity.py12
-rw-r--r--keystonelight/service.py9
-rw-r--r--tests/test_identity_api.py13
3 files changed, 28 insertions, 6 deletions
diff --git a/keystonelight/identity.py b/keystonelight/identity.py
index 3423c683..ac5517b6 100644
--- a/keystonelight/identity.py
+++ b/keystonelight/identity.py
@@ -32,28 +32,28 @@ class Manager(object):
return self.driver.get_extras(user_id, tenant_id)
# CRUD operations
- def create_user(self, context, user_id, **data):
+ def create_user(self, context, user_id, data):
return self.driver.create_user(user_id, data)
- def update_user(self, context, user_id, **data):
+ def update_user(self, context, user_id, data):
return self.driver.update_user(user_id, data)
def delete_user(self, context, user_id):
return self.driver.delete_user(user_id)
- def create_tenant(self, context, tenant_id, **data):
+ def create_tenant(self, context, tenant_id, data):
return self.driver.create_tenant(tenant_id, data)
- def update_tenant(self, context, tenant_id, **data):
+ def update_tenant(self, context, tenant_id, data):
return self.driver.update_tenant(tenant_id, data)
def delete_tenant(self, context, tenant_id):
return self.driver.delete_tenant(tenant_id)
- def create_extras(self, context, user_id, tenant_id, **data):
+ def create_extras(self, context, user_id, tenant_id, data):
return self.driver.create_extras(user_id, tenant_id, data)
- def update_extras(self, context, user_id, tenant_id, **data):
+ def update_extras(self, context, user_id, tenant_id, data):
return self.driver.update_extras(user_id, tenant_id, data)
def delete_extras(self, context, user_id, tenant_id):
diff --git a/keystonelight/service.py b/keystonelight/service.py
index 682f5151..272e0822 100644
--- a/keystonelight/service.py
+++ b/keystonelight/service.py
@@ -1,5 +1,6 @@
import json
import logging
+import uuid
import routes
import webob.dec
@@ -124,6 +125,14 @@ class IdentityController(BaseApplication):
return tenants_ref
+ def create_user(self, context, **kw):
+ user_id = uuid.uuid4().hex
+ kw['id'] = user_id
+ return self.identity_api.create_user(context, user_id=user_id, data=kw)
+
+ def get_user(self, context, user_id):
+ return self.identity_api.get_user(context, user_id=user_id)
+
class Router(wsgi.Router):
def __init__(self, options):
diff --git a/tests/test_identity_api.py b/tests/test_identity_api.py
index 885d4314..8799ff36 100644
--- a/tests/test_identity_api.py
+++ b/tests/test_identity_api.py
@@ -73,3 +73,16 @@ class IdentityApi(test.TestCase):
resp = c.get_tenants(user_id=self.user_foo['id'])
data = json.loads(resp.body)
self.assertDictEquals(self.tenant_bar, data[0])
+
+ def test_create_user(self):
+ token_id = self.options['admin_token']
+ c = client.TestClient(self.app, token=token_id)
+ user_ref = models.User()
+ resp = c.create_user(**user_ref)
+ data = json.loads(resp.body)
+ self.assert_(data['id'])
+
+ new_resp = c.get_user(user_id=data['id'])
+ new_data = json.loads(new_resp.body)
+
+ self.assertDictEquals(data, new_data)