From 8d94885df02ea0a4826a1f271f011dfefd2c2ca9 Mon Sep 17 00:00:00 2001 From: Trevor McCasland Date: Mon, 4 Dec 2017 09:55:38 -0600 Subject: [PATCH] no force_tenant_isolation in DefaultDomainTestJSON No need for dynamic credentials to test showing the default domain. By setting this value to False, consumers with an immutable user source can execute this test. Depends-On: I83a9b8af775580d36a1141be55e9c1cc283a75b6 Partial-Bug: #1714277 Change-Id: Ib85691ae3f7b5a4d4a9da620b6ec46c44380ef03 --- tempest/api/identity/admin/v3/test_domains.py | 15 ------- tempest/api/identity/v3/test_domains.py | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 tempest/api/identity/v3/test_domains.py diff --git a/tempest/api/identity/admin/v3/test_domains.py b/tempest/api/identity/admin/v3/test_domains.py index 72b6be47ba..07175f4cf4 100644 --- a/tempest/api/identity/admin/v3/test_domains.py +++ b/tempest/api/identity/admin/v3/test_domains.py @@ -153,18 +153,3 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest): expected_data = {'name': d_name, 'enabled': True} self.assertEqual('', domain['description']) self.assertDictContainsSubset(expected_data, domain) - - -class DefaultDomainTestJSON(base.BaseIdentityV3AdminTest): - - @classmethod - def resource_setup(cls): - cls.domain_id = CONF.identity.default_domain_id - super(DefaultDomainTestJSON, cls).resource_setup() - - @decorators.attr(type='smoke') - @decorators.idempotent_id('17a5de24-e6a0-4e4a-a9ee-d85b6e5612b5') - def test_default_domain_exists(self): - domain = self.domains_client.show_domain(self.domain_id)['domain'] - - self.assertTrue(domain['enabled']) diff --git a/tempest/api/identity/v3/test_domains.py b/tempest/api/identity/v3/test_domains.py new file mode 100644 index 0000000000..9f132dd8fc --- /dev/null +++ b/tempest/api/identity/v3/test_domains.py @@ -0,0 +1,39 @@ +# Copyright 2013 OpenStack Foundation +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from tempest.api.identity import base +from tempest import config +from tempest.lib import decorators + +CONF = config.CONF + + +class DefaultDomainTestJSON(base.BaseIdentityV3Test): + + @classmethod + def setup_clients(cls): + super(DefaultDomainTestJSON, cls).setup_clients() + cls.domains_client = cls.os_primary.domains_client + + @classmethod + def resource_setup(cls): + super(DefaultDomainTestJSON, cls).resource_setup() + cls.domain_id = CONF.identity.default_domain_id + + @decorators.attr(type='smoke') + @decorators.idempotent_id('17a5de24-e6a0-4e4a-a9ee-d85b6e5612b5') + def test_default_domain_exists(self): + domain = self.domains_client.show_domain(self.domain_id)['domain'] + self.assertTrue(domain['enabled'])