openstack/tempest
Code Issues Proposed changes

Merge "Use credentials domain instead of creating new one"

Browse Source
This commit is contained in:
Zuul 2019-03-17 21:42:16 +00:00 committed by Gerrit Code Review
commit 7bb845524d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tempest/api/identity/admin/v3/test_list_projects.py
View File

@ -13,11 +13,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
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
from tempest.lib import decorators from tempest.lib import decorators
LOG = logging.getLogger(__name__)
CONF = config.CONF CONF = config.CONF
@ -26,6 +29,9 @@ class BaseListProjectsTestJSON(base.BaseIdentityV3AdminTest):
def _list_projects_with_params(self, included, excluded, params, key): def _list_projects_with_params(self, included, excluded, params, key):
# Validate that projects in ``included`` belongs to the projects # Validate that projects in ``included`` belongs to the projects
# returned that match ``params`` but not projects in ``excluded`` # returned that match ``params`` but not projects in ``excluded``
all_projects = self.projects_client.list_projects()['projects']
LOG.debug("Complete list of projects available in keystone: %s",
all_projects)
body = self.projects_client.list_projects(params)['projects'] body = self.projects_client.list_projects(params)['projects']
for p in included: for p in included:
self.assertIn(p[key], map(lambda x: x[key], body)) self.assertIn(p[key], map(lambda x: x[key], body))
@ -39,13 +45,12 @@ class ListProjectsTestJSON(BaseListProjectsTestJSON):
def resource_setup(cls): def resource_setup(cls):
super(ListProjectsTestJSON, cls).resource_setup() super(ListProjectsTestJSON, cls).resource_setup()
cls.project_ids = list() cls.project_ids = list()
# Create a domain cls.domain_id = cls.os_admin.credentials.domain_id
cls.domain = cls.create_domain()
# Create project with domain # Create project with domain
cls.p1_name = data_utils.rand_name('project') cls.p1_name = data_utils.rand_name('project')
cls.p1 = cls.projects_client.create_project( cls.p1 = cls.projects_client.create_project(
cls.p1_name, enabled=False, cls.p1_name, enabled=False,
domain_id=cls.domain['id'])['project'] domain_id=cls.domain_id)['project']
cls.addClassResourceCleanup(cls.projects_client.delete_project, cls.addClassResourceCleanup(cls.projects_client.delete_project,
cls.p1['id']) cls.p1['id'])
cls.project_ids.append(cls.p1['id']) cls.project_ids.append(cls.p1['id'])