Keystone backend preparation for domain-scoping

These changes lay the ground work for the implmentation of
domain-scoping, but are benign in that they don't change the token.
They include making domain_id a first-class attribute in the user
and project entity (i.e. move it out of the 'extra' attribute),
filling in domain grant and project support for the kvs backend and
fixing a series of issues in the mirgation to make it work for both
MySQL, Postgresql and sqlite.

A further, separate, commit will actually provide the code to
update the actual tokens once the v3 token support has been added.

blueprint domain-scoping
blueprint default-domain

Change-Id: I55ab7947a6a1efbab003bd234856bd3805bb4a63

1 files changed, 26 insertions, 16 deletions

diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py
index 3b6d1e13..cc92b02f 100644
--- a/tests/test_backend_ldap.py
+++ b/tests/test_backend_ldap.py
@@ -15,6 +15,7 @@
 # under the License.
 
 import uuid
+import nose.exc
 
 from keystone.common.ldap import fakeldap
 from keystone import config
@@ -413,48 +414,57 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
         user_api.get_connection(user=None, password=None)
 
 # TODO (henry-nash) These need to be removed when the full LDAP implementation
-# is submitted - see BugL #1092187
+# is submitted - see Bugs 1092187, 1101287, 1101276, 1101289
     def test_group_crud(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_add_user_to_group(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_add_user_to_group_404(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_check_user_in_group(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_check_user_not_in_group(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_list_users_in_group(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_remove_user_from_group(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_remove_user_from_group_404(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1092187')
 
     def test_get_role_grant_by_user_and_project(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
 
     def test_get_role_grants_for_user_and_project_404(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
 
     def test_add_role_grant_to_user_and_project_404(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
 
     def test_remove_role_grant_from_user_and_project(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
 
     def test_get_and_remove_role_grant_by_group_and_project(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
 
     def test_get_and_remove_role_grant_by_group_and_domain(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
 
     def test_get_and_remove_role_grant_by_user_and_domain(self):
-        pass
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
+
+    def test_get_and_remove_correct_role_grant_from_a_mix(self):
+        raise nose.exc.SkipTest('Blocked by bug 1101287')
+
+    def test_domain_crud(self):
+        raise nose.exc.SkipTest('Blocked by bug 1101276')
+
+    def test_project_crud(self):
+        raise nose.exc.SkipTest('Blocked by bug 1101289')