From 4e993e425167078a7fea63368b8a487440316c12 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Fri, 5 Jun 2020 17:56:10 +0000
Subject: [PATCH] Move add_tempest_roles to keystone setup.py

---
 .../charm_tests/keystone/__init__.py          |  2 ++
 zaza/openstack/charm_tests/keystone/setup.py  | 30 +++++++++++++++++++
 zaza/openstack/charm_tests/tempest/setup.py   | 29 ++++--------------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/zaza/openstack/charm_tests/keystone/__init__.py b/zaza/openstack/charm_tests/keystone/__init__.py
index 6c4cca6..4d2e829 100644
--- a/zaza/openstack/charm_tests/keystone/__init__.py
+++ b/zaza/openstack/charm_tests/keystone/__init__.py
@@ -26,6 +26,8 @@ DEMO_ADMIN_USER_PASSWORD = 'password'
 DEMO_USER = 'demo'
 DEMO_PASSWORD = 'password'
 
+TEMPEST_ROLES = ['member', 'ResellerAdmin']
+
 
 class BaseKeystoneTest(test_utils.OpenStackBaseTest):
     """Base for Keystone charm tests."""
diff --git a/zaza/openstack/charm_tests/keystone/setup.py b/zaza/openstack/charm_tests/keystone/setup.py
index 688e3cd..6dbb7c1 100644
--- a/zaza/openstack/charm_tests/keystone/setup.py
+++ b/zaza/openstack/charm_tests/keystone/setup.py
@@ -14,6 +14,8 @@
 
 """Code for setting up keystone."""
 
+import keystoneauth1
+
 import zaza.openstack.utilities.openstack as openstack_utils
 from zaza.openstack.charm_tests.keystone import (
     BaseKeystoneTest,
@@ -24,6 +26,7 @@ from zaza.openstack.charm_tests.keystone import (
     DEMO_ADMIN_USER_PASSWORD,
     DEMO_USER,
     DEMO_PASSWORD,
+    TEMPEST_ROLES,
 )
 
 
@@ -115,3 +118,30 @@ def add_demo_user():
     else:
         # create only V3 user
         _v3()
+
+
+def _add_additional_roles(roles):
+    """Add additional roles to this deployment.
+
+    :param ctxt: roles
+    :type ctxt: list
+    :returns: None
+    :rtype: None
+    """
+    keystone_session = openstack_utils.get_overcloud_keystone_session()
+    keystone_client = openstack_utils.get_keystone_session_client(
+        keystone_session)
+    for role_name in roles:
+        try:
+            keystone_client.roles.create(role_name)
+        except keystoneauth1.exceptions.http.Conflict:
+            pass
+
+
+def add_tempest_roles():
+    """Add tempest roles to this deployment.
+
+    :returns: None
+    :rtype: None
+    """
+    _add_additional_roles(TEMPEST_ROLES)
diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index f93b3d3..1b5b4de 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -27,9 +27,6 @@ import zaza.openstack.charm_tests.tempest.templates.tempest_v2 as tempest_v2
 import zaza.openstack.charm_tests.tempest.templates.tempest_v3 as tempest_v3
 import zaza.openstack.charm_tests.tempest.templates.accounts as accounts
 
-import keystoneauth1
-import novaclient
-
 SETUP_ENV_VARS = [
     'OS_TEST_GATEWAY',
     'OS_TEST_CIDR_EXT',
@@ -60,7 +57,7 @@ def add_nova_config(ctxt, keystone_session):
 
     :param ctxt: Context dictionary
     :type ctxt: dict
-    :returns keystone_session: keystoneauth1.session.Session object
+    :param keystone_session: keystoneauth1.session.Session object
     :type: keystoneauth1.session.Session
     :returns: None
     :rtype: None
@@ -79,7 +76,7 @@ def add_neutron_config(ctxt, keystone_session):
 
     :param ctxt: Context dictionary
     :type ctxt: dict
-    :returns keystone_session: keystoneauth1.session.Session object
+    :param keystone_session: keystoneauth1.session.Session object
     :type: keystoneauth1.session.Session
     :returns: None
     :rtype: None
@@ -120,7 +117,7 @@ def add_glance_config(ctxt, keystone_session):
 
     :param ctxt: Context dictionary
     :type ctxt: dict
-    :returns keystone_session: keystoneauth1.session.Session object
+    :param keystone_session: keystoneauth1.session.Session object
     :type: keystoneauth1.session.Session
     :returns: None
     :rtype: None
@@ -142,7 +139,7 @@ def add_cinder_config(ctxt, keystone_session):
 
     :param ctxt: Context dictionary
     :type ctxt: dict
-    :returns keystone_session: keystoneauth1.session.Session object
+    :param keystone_session: keystoneauth1.session.Session object
     :type: keystoneauth1.session.Session
     :returns: None
     :rtype: None
@@ -162,7 +159,7 @@ def add_keystone_config(ctxt, keystone_session):
 
     :param ctxt: Context dictionary
     :type ctxt: dict
-    :returns keystone_session: keystoneauth1.session.Session object
+    :param keystone_session: keystoneauth1.session.Session object
     :type: keystoneauth1.session.Session
     :returns: None
     :rtype: None
@@ -293,19 +290,3 @@ def render_tempest_config_keystone_v3():
     :rtype: None
     """
     setup_tempest(tempest_v3, accounts)
-
-
-def add_tempest_roles():
-    """Add tempest roles overcloud.
-
-    :returns: None
-    :rtype: None
-    """
-    keystone_session = openstack_utils.get_overcloud_keystone_session()
-    keystone_client = openstack_utils.get_keystone_session_client(
-        keystone_session)
-    for role_name in ['member', 'ResellerAdmin']:
-        try:
-            keystone_client.roles.create(role_name)
-        except keystoneauth1.exceptions.http.Conflict:
-            pass