Support both admin role name

[snaps.git] / snaps / openstack / tests / create_user_tests.py

diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py
index 96de61e..c15a71f 100644 (file)
--- 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,11 +103,14 @@ 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,
+                   'Admin': self.os_creds.project_name},
+            domain_name=self.os_creds.user_domain_name)
 
-        self.keystone = keystone_utils.keystone_client(self.os_creds)
+        self.keystone = keystone_utils.keystone_client(self.os_creds, self.os_session)
 
         # Initialize for cleanup
         self.user_creator = None
@@ -118,6 +122,8 @@ class CreateUserSuccessTests(OSComponentTestCase):
         if self.user_creator:
             self.user_creator.clean()
 
+        super(self.__class__, self).__clean__()
+
     def test_create_user(self):
         """
         Tests the creation of an OpenStack user.
@@ -177,12 +183,14 @@ 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')
+        if not role:
+            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))