Refactored api function names to avoid redundancy with new module names

7 files changed, 88 insertions, 90 deletions

diff --git a/keystone/db/sqlalchemy/api/baseurl.py b/keystone/db/sqlalchemy/api/baseurl.py
index cec6e581..3a046c22 100644
--- a/keystone/db/sqlalchemy/api/baseurl.py
+++ b/keystone/db/sqlalchemy/api/baseurl.py
@@ -17,27 +17,27 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased
 
-def baseurls_create(values):
+def create(values):
     baseurls_ref = models.BaseUrls()
     baseurls_ref.update(values)
     baseurls_ref.save()
     return baseurls_ref
 
 
-def baseurls_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.BaseUrls).filter_by(id=id).first()
     return result
 
 
-def baseurls_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.BaseUrls).all()
 
 
-def baseurls_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -50,7 +50,7 @@ def baseurls_get_page(marker, limit, session=None):
                             models.BaseUrls.id.desc()).limit(limit).all()
 
 
-def baseurls_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.BaseUrls).order_by(\
@@ -88,7 +88,7 @@ def baseurls_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def baseurls_ref_get_by_tenant_get_page(tenant_id, marker, limit,
+def ref_get_by_tenant_get_page(tenant_id, marker, limit,
                                         session=None):
     if not session:
         session = get_session()
@@ -104,7 +104,7 @@ def baseurls_ref_get_by_tenant_get_page(tenant_id, marker, limit,
             order_by(models.TenantBaseURLAssociation.id).limit(limit).all()
 
 
-def baseurls_ref_get_by_tenant_get_page_markers(tenant_id, marker, limit,
+def ref_get_by_tenant_get_page_markers(tenant_id, marker, limit,
                                                 session=None):
     if not session:
         session = get_session()
@@ -154,14 +154,14 @@ def baseurls_ref_get_by_tenant_get_page_markers(tenant_id, marker, limit,
     return (prev, next)
 
 
-def baseurls_ref_add(values):
+def ref_add(values):
     baseurls_ref = models.TenantBaseURLAssociation()
     baseurls_ref.update(values)
     baseurls_ref.save()
     return baseurls_ref
 
 
-def baseurls_ref_get(id, session=None):
+def ref_get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.TenantBaseURLAssociation).\
@@ -169,7 +169,7 @@ def baseurls_ref_get(id, session=None):
     return result
 
 
-def baseurls_ref_get_by_tenant(tenant_id, session=None):
+def ref_get_by_tenant(tenant_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.TenantBaseURLAssociation).\
@@ -177,9 +177,9 @@ def baseurls_ref_get_by_tenant(tenant_id, session=None):
     return result
 
 
-def baseurls_ref_delete(id, session=None):
+def ref_delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        baseurls_ref = baseurls_ref_get(id, session)
+        baseurls_ref = ref_get(id, session)
         session.delete(baseurls_ref)
diff --git a/keystone/db/sqlalchemy/api/group.py b/keystone/db/sqlalchemy/api/group.py
index 866073ac..dbc75752 100644
--- a/keystone/db/sqlalchemy/api/group.py
+++ b/keystone/db/sqlalchemy/api/group.py
@@ -17,14 +17,14 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased
 
-def group_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group).filter_by(id=id).first()
     return result
 
 
-def group_users(id, session=None):
+def get_users(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.User).filter_by(\
@@ -32,14 +32,14 @@ def group_users(id, session=None):
     return result
 
 
-def group_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group)
     return result
 
 
-def group_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -52,7 +52,7 @@ def group_get_page(marker, limit, session=None):
                             models.Group.id.desc()).limit(limit).all()
 
 
-def group_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Group).order_by(\
@@ -90,14 +90,14 @@ def group_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def group_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        group_ref = group_get(id, session)
+        group_ref = get(id, session)
         session.delete(group_ref)
 
-def groups_get_by_user_get_page(user_id, marker, limit, session=None):
+def get_by_user_get_page(user_id, marker, limit, session=None):
     if not session:
         session = get_session()
     uga = aliased(models.UserGroupAssociation)
@@ -116,7 +116,7 @@ def groups_get_by_user_get_page(user_id, marker, limit, session=None):
                             group.id).limit(limit).all()
 
 
-def groups_get_by_user_get_page_markers(user_id, marker, limit, session=None):
+def get_by_user_get_page_markers(user_id, marker, limit, session=None):
     if not session:
         session = get_session()
     uga = aliased(models.UserGroupAssociation)
diff --git a/keystone/db/sqlalchemy/api/role.py b/keystone/db/sqlalchemy/api/role.py
index e16d8e63..1d39be0a 100644
--- a/keystone/db/sqlalchemy/api/role.py
+++ b/keystone/db/sqlalchemy/api/role.py
@@ -17,27 +17,27 @@
 
 from keystone.db.sqlalchemy import get_session, models
 
-def role_create(values):
+def create(values):
     role_ref = models.Role()
     role_ref.update(values)
     role_ref.save()
     return role_ref
 
 
-def role_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Role).filter_by(id=id).first()
     return result
 
 
-def role_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.Role).all()
 
 
-def role_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -50,7 +50,7 @@ def role_get_page(marker, limit, session=None):
                             models.Role.id.desc()).limit(limit).all()
 
 
-def role_ref_get_page(marker, limit, user_id, session=None):
+def ref_get_page(marker, limit, user_id, session=None):
     if not session:
         session = get_session()
 
@@ -65,35 +65,35 @@ def role_ref_get_page(marker, limit, user_id, session=None):
                 models.UserRoleAssociation.id.desc()).limit(limit).all()
 
 
-def role_ref_get_all_global_roles(user_id, session=None):
+def ref_get_all_global_roles(user_id, session=None):
     if not session:
         session = get_session()
     return session.query(models.UserRoleAssociation).\
                 filter_by(user_id=user_id).filter("tenant_id is null").all()
 
 
-def role_ref_get_all_tenant_roles(user_id, tenant_id, session=None):
+def ref_get_all_tenant_roles(user_id, tenant_id, session=None):
     if not session:
         session = get_session()
     return session.query(models.UserRoleAssociation).\
             filter_by(user_id=user_id).filter_by(tenant_id=tenant_id).all()
 
 
-def role_ref_get(id, session=None):
+def ref_get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.UserRoleAssociation).filter_by(id=id).first()
     return result
 
 
-def role_ref_delete(id, session=None):
+def ref_delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        role_ref = role_ref_get(id, session)
+        role_ref = ref_get(id, session)
         session.delete(role_ref)
 
-def role_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Role).order_by(\
@@ -131,7 +131,7 @@ def role_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def role_ref_get_page_markers(user_id, marker, limit, session=None):
+def ref_get_page_markers(user_id, marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.UserRoleAssociation).filter_by(\
diff --git a/keystone/db/sqlalchemy/api/tenant.py b/keystone/db/sqlalchemy/api/tenant.py
index 29646e15..2af370a0 100644
--- a/keystone/db/sqlalchemy/api/tenant.py
+++ b/keystone/db/sqlalchemy/api/tenant.py
@@ -17,21 +17,21 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased
 
-def tenant_create(values):
+def create(values):
     tenant_ref = models.Tenant()
     tenant_ref.update(values)
     tenant_ref.save()
     return tenant_ref
 
 
-def tenant_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Tenant).filter_by(id=id).first()
     return result
 
 
-def tenant_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.Tenant).all()
@@ -51,8 +51,7 @@ def tenants_for_user_get_page(user, marker, limit, session=None):
                 marker='%s' % marker).order_by(\
                 tenant.id.desc()).limit(limit).all()
     else:
-        return q3.order_by(\
-                            tenant.id.desc()).limit(limit).all()
+        return q3.order_by(tenant.id.desc()).limit(limit).all()
 
 
 def tenants_for_user_get_page_markers(user, marker, limit, session=None):
@@ -98,7 +97,7 @@ def tenants_for_user_get_page_markers(user, marker, limit, session=None):
     return (prev, next)
 
 
-def tenant_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -111,7 +110,7 @@ def tenant_get_page(marker, limit, session=None):
                             models.Tenant.id.desc()).limit(limit).all()
 
 
-def tenant_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Tenant).order_by(\
@@ -149,7 +148,7 @@ def tenant_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def tenant_is_empty(id, session=None):
+def is_empty(id, session=None):
     if not session:
         session = get_session()
     a_user = session.query(models.UserRoleAssociation).filter_by(\
@@ -165,24 +164,24 @@ def tenant_is_empty(id, session=None):
     return True
 
 
-def tenant_update(id, values, session=None):
+def update(id, values, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenant_ref = tenant_get(id, session)
+        tenant_ref = get(id, session)
         tenant_ref.update(values)
         tenant_ref.save(session=session)
 
 
-def tenant_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenant_ref = tenant_get(id, session)
+        tenant_ref = get(id, session)
         session.delete(tenant_ref)
 
 
-def tenant_baseurls_get_all(tenant_id, session=None):
+def get_all_baseurls(tenant_id, session=None):
     if not session:
         session = get_session()
     tba = aliased(models.TenantBaseURLAssociation)
@@ -190,3 +189,9 @@ def tenant_baseurls_get_all(tenant_id, session=None):
     return session.query(baseUrls).join((tba,
         tba.baseURLs_id == baseUrls.id)).\
             filter(tba.tenant_id == tenant_id).all()
+
+def get_role_assignments(tenant_id, session=None):
+    if not session:
+        session = get_session()
+    return session.query(models.UserRoleAssociation).\
+                        filter_by(tenant_id=tenant_id)
diff --git a/keystone/db/sqlalchemy/api/tenant_group.py b/keystone/db/sqlalchemy/api/tenant_group.py
index 232c939f..4efce544 100644
--- a/keystone/db/sqlalchemy/api/tenant_group.py
+++ b/keystone/db/sqlalchemy/api/tenant_group.py
@@ -17,14 +17,14 @@
 
 from keystone.db.sqlalchemy import get_session, models
 
-def tenant_group_create(values):
+def create(values):
     group_ref = models.Group()
     group_ref.update(values)
     group_ref.save()
     return group_ref
 
 
-def tenant_group_is_empty(id, session=None):
+def is_empty(id, session=None):
     if not session:
         session = get_session()
     a_user = session.query(models.UserGroupAssociation).filter_by(
@@ -34,7 +34,7 @@ def tenant_group_is_empty(id, session=None):
     return True
 
 
-def tenant_group_get(id, tenant, session=None):
+def get(id, tenant, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group).filter_by(id=id, \
@@ -43,7 +43,7 @@ def tenant_group_get(id, tenant, session=None):
     return result
 
 
-def tenant_group_get_page(tenantId, marker, limit, session=None):
+def get_page(tenantId, marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -58,7 +58,7 @@ def tenant_group_get_page(tenantId, marker, limit, session=None):
     #return session.query(models.Tenant).all()
 
 
-def tenant_group_get_page_markers(tenantId, marker, limit, session=None):
+def get_page_markers(tenantId, marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.Group).filter_by(\
@@ -101,11 +101,11 @@ def tenant_group_get_page_markers(tenantId, marker, limit, session=None):
     return (prev, next)
 
 
-def tenant_group_update(id, tenant_id, values, session=None):
+def update(id, tenant_id, values, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenant_ref = tenant_group_get(id, tenant_id, session)
+        tenant_ref = get(id, tenant_id, session)
         tenant_ref.update(values)
         tenant_ref.save(session=session)
 
@@ -114,12 +114,5 @@ def delete(id, tenant_id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        tenantgroup_ref = tenant_group_get(id, tenant_id, session)
+        tenantgroup_ref = get(id, tenant_id, session)
         session.delete(tenantgroup_ref)
-
-
-def tenant_role_assignments_get(tenant_id, session=None):
-    if not session:
-        session = get_session()
-    return session.query(models.UserRoleAssociation).\
-                        filter_by(tenant_id=tenant_id)
diff --git a/keystone/db/sqlalchemy/api/token.py b/keystone/db/sqlalchemy/api/token.py
index 847e668f..1863292f 100644
--- a/keystone/db/sqlalchemy/api/token.py
+++ b/keystone/db/sqlalchemy/api/token.py
@@ -17,29 +17,29 @@
 
 from keystone.db.sqlalchemy import get_session, models
 
-def token_create(values):
+def create(values):
     token_ref = models.Token()
     token_ref.update(values)
     token_ref.save()
     return token_ref
 
 
-def token_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Token).filter_by(token_id=id).first()
     return result
 
 
-def token_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        token_ref = token_get(id, session)
+        token_ref = get(id, session)
         session.delete(token_ref)
 
 
-def token_for_user(user_id, session=None):
+def get_for_user(user_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Token).filter_by(
@@ -47,7 +47,7 @@ def token_for_user(user_id, session=None):
     return result
 
 
-def token_for_user_tenant(user_id, tenant_id, session=None):
+def get_for_user_by_tenant(user_id, tenant_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Token).filter_by(
@@ -55,7 +55,7 @@ def token_for_user_tenant(user_id, tenant_id, session=None):
     return result
 
 
-def token_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     return session.query(models.Token).all()
diff --git a/keystone/db/sqlalchemy/api/user.py b/keystone/db/sqlalchemy/api/user.py
index af1d8d59..dfc7bbcf 100644
--- a/keystone/db/sqlalchemy/api/user.py
+++ b/keystone/db/sqlalchemy/api/user.py
@@ -17,14 +17,14 @@
 
 from keystone.db.sqlalchemy import get_session, models, aliased, joinedload
 
-def user_get_all(session=None):
+def get_all(session=None):
     if not session:
         session = get_session()
     result = session.query(models.User)
     return result
 
 
-def get_user_by_group(user_id, group_id, session=None):
+def get_by_group(user_id, group_id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.UserGroupAssociation).filter_by(\
@@ -32,29 +32,29 @@ def get_user_by_group(user_id, group_id, session=None):
     return result
 
 
-def user_tenant_group(values):
+def tenant_group(values):
     user_ref = models.UserGroupAssociation()
     user_ref.update(values)
     user_ref.save()
     return user_ref
 
 
-def user_tenant_group_delete(id, group_id, session=None):
+def tenant_group_delete(id, group_id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        usertenantgroup_ref = get_user_by_group(id, group_id, session)
+        usertenantgroup_ref = get_by_group(id, group_id, session)
         session.delete(usertenantgroup_ref)
 
 
-def user_create(values):
+def create(values):
     user_ref = models.User()
     user_ref.update(values)
     user_ref.save()
     return user_ref
 
 
-def user_get(id, session=None):
+def get(id, session=None):
     if not session:
         session = get_session()
     #TODO(Ziad): finish cleaning up model
@@ -64,7 +64,7 @@ def user_get(id, session=None):
     return result
 
 
-def user_get_page(marker, limit, session=None):
+def get_page(marker, limit, session=None):
     if not session:
         session = get_session()
 
@@ -77,7 +77,7 @@ def user_get_page(marker, limit, session=None):
                             models.User.id.desc()).limit(limit).all()
 
 
-def user_get_page_markers(marker, limit, session=None):
+def get_page_markers(marker, limit, session=None):
     if not session:
         session = get_session()
     first = session.query(models.User).order_by(\
@@ -115,14 +115,14 @@ def user_get_page_markers(marker, limit, session=None):
     return (prev, next)
 
 
-def user_get_email(email, session=None):
+def get_by_email(email, session=None):
     if not session:
         session = get_session()
     result = session.query(models.User).filter_by(email=email).first()
     return result
 
 
-def user_groups(id, session=None):
+def get_groups(id, session=None):
     if not session:
         session = get_session()
     result = session.query(models.Group).filter_by(\
@@ -138,11 +138,11 @@ def user_roles_by_tenant(user_id, tenant_id, session=None):
     return result
 
 
-def user_update(id, values, session=None):
+def update(id, values, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        user_ref = user_get(id, session)
+        user_ref = get(id, session)
         user_ref.update(values)
         user_ref.save(session=session)
 
@@ -212,15 +212,15 @@ def users_tenant_group_get_page_markers(group_id, marker, limit, session=None):
     return (prev, next)
 
 
-def user_delete(id, session=None):
+def delete(id, session=None):
     if not session:
         session = get_session()
     with session.begin():
-        user_ref = user_get(id, session)
+        user_ref = get(id, session)
         session.delete(user_ref)
 
 
-def user_get_by_tenant(id, tenant_id, session=None):
+def get_by_tenant(id, tenant_id, session=None):
     if not session:
         session = get_session()
     # Most common use case: user lives in tenant
@@ -233,19 +233,19 @@ def user_get_by_tenant(id, tenant_id, session=None):
     user_tenant = session.query(models.UserRoleAssociation).filter_by(\
         tenant_id=tenant_id, user_id=id).first()
     if user_tenant:
-        return user_get(id, session)
+        return get(id, session)
     else:
         return None
 
 
-def user_get_by_group(id, session=None):
+def get_group_by_tenant(id, session=None):
     if not session:
         session = get_session()
     user_group = session.query(models.Group).filter_by(tenant_id=id).all()
     return user_group
 
 
-def user_delete_tenant(id, tenant_id, session=None):
+def delete_tenant(id, tenant_id, session=None):
     if not session:
         session = get_session()
     with session.begin():
@@ -254,14 +254,14 @@ def user_delete_tenant(id, tenant_id, session=None):
             for user_tenant_ref in users_tenant_ref:
                 session.delete(user_tenant_ref)
 
-        user_group_ref = user_get_by_group(tenant_id, session)
+        user_group_ref = get_group_by_tenant(tenant_id, session)
 
         if user_group_ref is not None:
             for user_group in user_group_ref:
-                group_users = session.query(models.UserGroupAssociation)\
+                get_users = session.query(models.UserGroupAssociation)\
                                 .filter_by(user_id=id,
                                         group_id=user_group.id).all()
-                for group_user in group_users:
+                for group_user in get_users:
                     session.delete(group_user)