Support both admin role name

Depending of the installer the admin role name can be admin
or Admin.

This patch was tested:
+-------------------+------------------+------------------+----------------+
|     TEST CASE     |     PROJECT      |     DURATION     |     RESULT     |
+-------------------+------------------+------------------+----------------+
|     api_check     |     functest     |      09:60       |      PASS      |
+-------------------+------------------+------------------+----------------+

Change-Id: I99815777794cd6524213abca1f04ec84dae1e760
Signed-off-by: Valentin Boucher <valentin.boucher@kontron.com>

diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py
index 718d5a3..c15a71f 100644 (file)
--- a/snaps/openstack/tests/create_user_tests.py
+++ b/snaps/openstack/tests/create_user_tests.py
@@ -106,7 +106,8 @@ class CreateUserSuccessTests(OSComponentTestCase):
         self.user_settings = UserConfig(
             name=guid + '-name',
             password=guid + '-password',
-            roles={'admin': self.os_creds.project_name},
+            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.os_session)
@@ -183,6 +184,8 @@ class CreateUserSuccessTests(OSComponentTestCase):
         self.assertEqual(created_user, retrieved_user)
 
         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(