Update Keystone code from repository.

Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00

5 files changed, 64 insertions, 14 deletions

diff --git a/keystone-moon/keystone/tests/unit/backend/core_ldap.py b/keystone-moon/keystone/tests/unit/backend/core_ldap.py
index a6cd0802..869bb620 100644
--- a/keystone-moon/keystone/tests/unit/backend/core_ldap.py
+++ b/keystone-moon/keystone/tests/unit/backend/core_ldap.py
@@ -17,7 +17,7 @@ from oslo_config import cfg
 from keystone.common import cache
 from keystone.common import ldap as common_ldap
 from keystone.common.ldap import core as common_ldap_core
-from keystone.tests import unit as tests
+from keystone.tests import unit
 from keystone.tests.unit import default_fixtures
 from keystone.tests.unit import fakeldap
 from keystone.tests.unit.ksfixtures import database
@@ -66,7 +66,7 @@ class BaseBackendLdapCommon(object):
 
     def config_files(self):
         config_files = super(BaseBackendLdapCommon, self).config_files()
-        config_files.append(tests.dirs.tests_conf('backend_ldap.conf'))
+        config_files.append(unit.dirs.tests_conf('backend_ldap.conf'))
         return config_files
 
     def get_user_enabled_vals(self, user):
@@ -99,13 +99,13 @@ class BaseBackendLdap(object):
         super(BaseBackendLdap, self).load_fixtures(fixtures)
 
 
-class BaseBackendLdapIdentitySqlEverythingElse(tests.SQLDriverOverrides):
+class BaseBackendLdapIdentitySqlEverythingElse(unit.SQLDriverOverrides):
     """Mixin base for Identity LDAP, everything else SQL backend tests."""
 
     def config_files(self):
         config_files = super(BaseBackendLdapIdentitySqlEverythingElse,
                              self).config_files()
-        config_files.append(tests.dirs.tests_conf('backend_ldap_sql.conf'))
+        config_files.append(unit.dirs.tests_conf('backend_ldap_sql.conf'))
         return config_files
 
     def setUp(self):
diff --git a/keystone-moon/keystone/tests/unit/backend/core_sql.py b/keystone-moon/keystone/tests/unit/backend/core_sql.py
index 9cbd858e..8c9f4957 100644
--- a/keystone-moon/keystone/tests/unit/backend/core_sql.py
+++ b/keystone-moon/keystone/tests/unit/backend/core_sql.py
@@ -13,12 +13,12 @@
 import sqlalchemy
 
 from keystone.common import sql
-from keystone.tests import unit as tests
+from keystone.tests import unit
 from keystone.tests.unit import default_fixtures
 from keystone.tests.unit.ksfixtures import database
 
 
-class BaseBackendSqlTests(tests.SQLDriverOverrides, tests.TestCase):
+class BaseBackendSqlTests(unit.SQLDriverOverrides, unit.TestCase):
 
     def setUp(self):
         super(BaseBackendSqlTests, self).setUp()
@@ -32,7 +32,7 @@ class BaseBackendSqlTests(tests.SQLDriverOverrides, tests.TestCase):
 
     def config_files(self):
         config_files = super(BaseBackendSqlTests, self).config_files()
-        config_files.append(tests.dirs.tests_conf('backend_sql.conf'))
+        config_files.append(unit.dirs.tests_conf('backend_sql.conf'))
         return config_files
 
 
diff --git a/keystone-moon/keystone/tests/unit/backend/domain_config/core.py b/keystone-moon/keystone/tests/unit/backend/domain_config/core.py
index c53d99b7..7bbbf313 100644
--- a/keystone-moon/keystone/tests/unit/backend/domain_config/core.py
+++ b/keystone-moon/keystone/tests/unit/backend/domain_config/core.py
@@ -17,7 +17,7 @@ import mock
 from testtools import matchers
 
 from keystone import exception
-from keystone.tests import unit as tests
+from keystone.tests import unit
 
 
 class DomainConfigTests(object):
@@ -523,7 +523,7 @@ class DomainConfigTests(object):
         # The escaping '%' should have been removed
         self.assertEqual('my_url/%(password)s', res['ldap']['url'])
 
-    @tests.skip_if_cache_disabled('domain_config')
+    @unit.skip_if_cache_disabled('domain_config')
     def test_cache_layer_get_sensitive_config(self):
         config = {'ldap': {'url': uuid.uuid4().hex,
                            'user_tree_dn': uuid.uuid4().hex,
@@ -549,3 +549,53 @@ class DomainConfigTests(object):
             {},
             self.domain_config_api.get_config_with_sensitive_info(
                 self.domain['id']))
+
+    def test_config_registration(self):
+        type = uuid.uuid4().hex
+        self.domain_config_api.obtain_registration(
+            self.domain['id'], type)
+        self.domain_config_api.release_registration(
+            self.domain['id'], type=type)
+
+        # Make sure that once someone has it, nobody else can get it.
+        # This includes the domain who already has it.
+        self.domain_config_api.obtain_registration(
+            self.domain['id'], type)
+        self.assertFalse(
+            self.domain_config_api.obtain_registration(
+                self.domain['id'], type))
+
+        # Make sure we can read who does have it
+        self.assertEqual(
+            self.domain['id'],
+            self.domain_config_api.read_registration(type))
+
+        # Make sure releasing it is silent if the domain specified doesn't
+        # have the registration
+        domain2 = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex}
+        self.resource_api.create_domain(domain2['id'], domain2)
+        self.domain_config_api.release_registration(
+            domain2['id'], type=type)
+
+        # If nobody has the type registered, then trying to read it should
+        # raise ConfigRegistrationNotFound
+        self.domain_config_api.release_registration(
+            self.domain['id'], type=type)
+        self.assertRaises(exception.ConfigRegistrationNotFound,
+                          self.domain_config_api.read_registration,
+                          type)
+
+        # Finally check multiple registrations are cleared if you free the
+        # registration without specifying the type
+        type2 = uuid.uuid4().hex
+        self.domain_config_api.obtain_registration(
+            self.domain['id'], type)
+        self.domain_config_api.obtain_registration(
+            self.domain['id'], type2)
+        self.domain_config_api.release_registration(self.domain['id'])
+        self.assertRaises(exception.ConfigRegistrationNotFound,
+                          self.domain_config_api.read_registration,
+                          type)
+        self.assertRaises(exception.ConfigRegistrationNotFound,
+                          self.domain_config_api.read_registration,
+                          type2)
diff --git a/keystone-moon/keystone/tests/unit/backend/role/core.py b/keystone-moon/keystone/tests/unit/backend/role/core.py
index f6e47fe9..d6e0d65c 100644
--- a/keystone-moon/keystone/tests/unit/backend/role/core.py
+++ b/keystone-moon/keystone/tests/unit/backend/role/core.py
@@ -16,7 +16,7 @@ import copy
 import uuid
 
 from keystone import exception
-from keystone.tests import unit as tests
+from keystone.tests import unit
 from keystone.tests.unit import default_fixtures
 
 
@@ -87,7 +87,7 @@ class RoleTests(object):
         expected_role_ids = set(role['id'] for role in default_fixtures.ROLES)
         self.assertEqual(expected_role_ids, role_ids)
 
-    @tests.skip_if_cache_disabled('role')
+    @unit.skip_if_cache_disabled('role')
     def test_cache_layer_role_crud(self):
         role = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex}
         role_id = role['id']
diff --git a/keystone-moon/keystone/tests/unit/backend/role/test_ldap.py b/keystone-moon/keystone/tests/unit/backend/role/test_ldap.py
index ba4b7c6e..44f2b612 100644
--- a/keystone-moon/keystone/tests/unit/backend/role/test_ldap.py
+++ b/keystone-moon/keystone/tests/unit/backend/role/test_ldap.py
@@ -16,7 +16,7 @@ import uuid
 from oslo_config import cfg
 
 from keystone import exception
-from keystone.tests import unit as tests
+from keystone.tests import unit
 from keystone.tests.unit.backend import core_ldap
 from keystone.tests.unit.backend.role import core as core_role
 from keystone.tests.unit import default_fixtures
@@ -35,7 +35,7 @@ class LdapRoleCommon(core_ldap.BaseBackendLdapCommon, core_role.RoleTests):
     pass
 
 
-class LdapRole(LdapRoleCommon, core_ldap.BaseBackendLdap, tests.TestCase):
+class LdapRole(LdapRoleCommon, core_ldap.BaseBackendLdap, unit.TestCase):
     """Test in an all-LDAP configuration.
 
     Include additional tests that are unique to LDAP (or need to be overridden)
@@ -149,7 +149,7 @@ class LdapRole(LdapRoleCommon, core_ldap.BaseBackendLdap, tests.TestCase):
 
 class LdapIdentitySqlEverythingElseRole(
     core_ldap.BaseBackendLdapIdentitySqlEverythingElse, LdapRoleCommon,
-        tests.TestCase):
+        unit.TestCase):
     """Test Identity in LDAP, Everything else in SQL."""
     pass