X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=snaps%2Fopenstack%2Ftests%2Fcreate_user_tests.py;h=d3eb4a69f80b0be8cad4b5da55f2c30da7435635;hb=24e4fc3b5efd3382836091809e075ea6b371e597;hp=96de61e691cc79cab58bc48ec21a108d0a00bfe7;hpb=b490e8dc9fb01c6f9c44dd9a585ca1a1ae00bf19;p=snaps.git diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py index 96de61e..d3eb4a6 100644 --- a/snaps/openstack/tests/create_user_tests.py +++ b/snaps/openstack/tests/create_user_tests.py @@ -15,6 +15,7 @@ import unittest import uuid +from snaps.config.user import UserConfig from snaps.openstack.create_user import OpenStackUser, UserSettings from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import keystone_utils @@ -102,9 +103,11 @@ class CreateUserSuccessTests(OSComponentTestCase): """ guid = str(uuid.uuid4())[:-19] guid = self.__class__.__name__ + '-' + guid - self.user_settings = UserSettings(name=guid + '-name', - password=guid + '-password', - roles={'admin': 'admin'}) + self.user_settings = UserConfig( + name=guid + '-name', + password=guid + '-password', + roles={'admin': self.os_creds.project_name}, + domain_name=self.os_creds.user_domain_name) self.keystone = keystone_utils.keystone_client(self.os_creds) @@ -177,12 +180,12 @@ class CreateUserSuccessTests(OSComponentTestCase): self.assertIsNotNone(retrieved_user) self.assertEqual(created_user, retrieved_user) - role = keystone_utils._get_os_role_by_name(self.keystone, 'admin') + role = keystone_utils.get_role_by_name(self.keystone, 'admin') self.assertIsNotNone(role) os_proj = keystone_utils.get_project( keystone=self.keystone, project_name=self.os_creds.project_name) - user_roles = keystone_utils._get_os_roles_by_user( + user_roles = keystone_utils.get_roles_by_user( self.keystone, retrieved_user, os_proj) self.assertIsNotNone(user_roles) self.assertEqual(1, len(user_roles))