openstack/tempest
Code Issues Proposed changes

Remove 'reseller' config option

Browse Source 
The reseller feature has been implemented as built-in feature which
can not be disabled since Mitaka, and Tempest doesn't support Liberty
now. So this patch removes the corresponding config option from Tempest.

Change-Id: Ieb974047fb204674cef82cf896016d6780a4757a
This commit is contained in:
Ken'ichi Ohmichi
2017-04-05 09:29:55 -07:00
parent d01fde620b
commit 1eaf6d4144
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/remove-deprecated-identity-reseller-option-4411c7e3951f1094.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated config option 'reseller' from identity_feature_enabled group has been removed.

6
tempest/api/identity/admin/v3/test_projects.py
View File

@@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import testtools
from tempest.api.identity import base from tempest.api.identity import base
from tempest import config from tempest import config
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
@@ -57,8 +55,6 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest):
self.assertEqual(project_name, body['name']) self.assertEqual(project_name, body['name'])
self.assertEqual(domain['id'], body['domain_id']) self.assertEqual(domain['id'], body['domain_id'])
@testtools.skipUnless(CONF.identity_feature_enabled.reseller,
'Reseller not available.')
@decorators.idempotent_id('1854f9c0-70bc-4d11-a08a-1c789d339e3d') @decorators.idempotent_id('1854f9c0-70bc-4d11-a08a-1c789d339e3d')
def test_project_create_with_parent(self): def test_project_create_with_parent(self):
# Create root project without providing a parent_id # Create root project without providing a parent_id
@@ -89,8 +85,6 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest):
self.assertEqual(root_project_id, parent_id) self.assertEqual(root_project_id, parent_id)
@decorators.idempotent_id('a7eb9416-6f9b-4dbb-b71b-7f73aaef59d5') @decorators.idempotent_id('a7eb9416-6f9b-4dbb-b71b-7f73aaef59d5')
@testtools.skipUnless(CONF.identity_feature_enabled.reseller,
'Reseller not available.')
def test_create_is_domain_project(self): def test_create_is_domain_project(self):
project_name = data_utils.rand_name('is_domain_project') project_name = data_utils.rand_name('is_domain_project')
project = self.projects_client.create_project( project = self.projects_client.create_project(

8
tempest/config.py
View File

@@ -217,14 +217,6 @@ IdentityFeatureGroup = [
"entry all which indicates every extension is enabled. " "entry all which indicates every extension is enabled. "
"Empty list indicates all extensions are disabled. " "Empty list indicates all extensions are disabled. "
"To get the list of extensions run: 'keystone discover'"), "To get the list of extensions run: 'keystone discover'"),
# TODO(rodrigods): Remove the reseller flag when Kilo and Liberty is end
# of life.
cfg.BoolOpt('reseller',
default=True,
help='Does the environment support reseller?',
deprecated_for_removal=True,
deprecated_reason="All supported versions of OpenStack now "
"support the 'reseller' feature"),
# TODO(rodrigods): This is a feature flag for bug 1590578 which is fixed # TODO(rodrigods): This is a feature flag for bug 1590578 which is fixed
# in Newton and Ocata. This option can be removed after Mitaka is end of # in Newton and Ocata. This option can be removed after Mitaka is end of
# life. # life.