Mixed LDAP/SQL Backend.

Supports the configuration where LDAP is used for  identity and
SQL is used for assignment.

blueprint split-identity

Change-Id: Ib91b5d804282b7f78fc2458ff64653bbf2cf5d9e

2 files changed, 5 insertions, 14 deletions

diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index de447b60..c06737c8 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.py
@@ -88,13 +88,13 @@ class Identity(identity.Driver):
         return self.assignment._set_default_domain(self.user.get_all())
 
     def get_user_by_name(self, user_name, domain_id):
-        self.assignment._validate_domain_id(domain_id)
+        self.assignment._validate_default_domain_id(domain_id)
         ref = identity.filter_user(self.user.get_by_name(user_name))
         return self.assignment._set_default_domain(ref)
 
     # CRUD
     def create_user(self, user_id, user):
-        user = self.assignment._validate_domain(user)
+        user = self.assignment._validate_default_domain(user)
         user_ref = self.user.create(user)
         tenant_id = user.get('tenant_id')
         if tenant_id is not None:
@@ -103,7 +103,7 @@ class Identity(identity.Driver):
                 (identity.filter_user(user_ref)))
 
     def update_user(self, user_id, user):
-        user = self.assignment._validate_domain(user)
+        user = self.assignment._validate_default_domain(user)
         if 'id' in user and user['id'] != user_id:
             raise exception.ValidationError('Cannot change user ID')
         old_obj = self.user.get(user_id)
@@ -143,7 +143,7 @@ class Identity(identity.Driver):
         self.user.delete(user_id)
 
     def create_group(self, group_id, group):
-        group = self.assignment._validate_domain(group)
+        group = self.assignment._validate_default_domain(group)
         group['name'] = clean.group_name(group['name'])
         return self.assignment._set_default_domain(self.group.create(group))
 
@@ -151,7 +151,7 @@ class Identity(identity.Driver):
         return self.assignment._set_default_domain(self.group.get(group_id))
 
     def update_group(self, group_id, group):
-        group = self.assignment._validate_domain(group)
+        group = self.assignment._validate_default_domain(group)
         if 'name' in group:
             group['name'] = clean.group_name(group['name'])
         return (self.assignment._set_default_domain
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index f725589f..981d24ed 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -110,15 +110,6 @@ class Manager(manager.Manager):
     def list_projects(self):
         return self.assignment.list_projects()
 
-    def _validate_domain(self, ref):
-        return self.assignment._validate_domain(ref)
-
-    def _validate_domain_id(self, domain_id):
-        return self.assignment._validate_domain_id(domain_id)
-
-    def _set_default_domain(self, ref):
-        return self.assignment._set_default_domain(ref)
-
     def get_role(self, role_id):
         return self.assignment.get_role(role_id)