From 827032b1c6ee00b98bff4fcc6506f3ebbb205990 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Thu, 6 Feb 2020 12:06:52 -0800
Subject: [PATCH] Standardize preferred-api-version as an int

---
 zaza/openstack/charm_tests/keystone/__init__.py | 9 ++++++---
 zaza/openstack/charm_tests/keystone/setup.py    | 2 +-
 zaza/openstack/charm_tests/keystone/tests.py    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/zaza/openstack/charm_tests/keystone/__init__.py b/zaza/openstack/charm_tests/keystone/__init__.py
index 432eac2..6c4cca6 100644
--- a/zaza/openstack/charm_tests/keystone/__init__.py
+++ b/zaza/openstack/charm_tests/keystone/__init__.py
@@ -34,6 +34,9 @@ class BaseKeystoneTest(test_utils.OpenStackBaseTest):
     def setUpClass(cls, application_name=None):
         """Run class setup for running Keystone charm operation tests."""
         super(BaseKeystoneTest, cls).setUpClass(application_name='keystone')
+        # Standardize v2 and v3 as ints
+        cls.api_v2 = 2
+        cls.api_v3 = 3
         # Check if we are related to Vault TLS certificates
         cls.tls_rid = zaza.model.get_relation_id(
             'keystone', 'vault', remote_interface_name='certificates')
@@ -51,9 +54,9 @@ class BaseKeystoneTest(test_utils.OpenStackBaseTest):
                 cls.keystone_ips.append(cls.vip)
         if (openstack_utils.get_os_release() <
                 openstack_utils.get_os_release('xenial_queens')):
-            cls.default_api_version = '2'
+            cls.default_api_version = cls.api_v2
         else:
-            cls.default_api_version = '3'
+            cls.default_api_version = cls.api_v3
         cls.admin_keystone_session = (
             openstack_utils.get_overcloud_keystone_session())
         cls.admin_keystone_client = (
@@ -66,6 +69,6 @@ class BaseKeystoneTest(test_utils.OpenStackBaseTest):
         """Set the preferred keystone api to v3 within called context."""
         with self.config_change(
                 {'preferred-api-version': self.default_api_version},
-                {'preferred-api-version': '3'},
+                {'preferred-api-version': self.api_v3},
                 application_name="keystone"):
             yield
diff --git a/zaza/openstack/charm_tests/keystone/setup.py b/zaza/openstack/charm_tests/keystone/setup.py
index c2cc4ac..688e3cd 100644
--- a/zaza/openstack/charm_tests/keystone/setup.py
+++ b/zaza/openstack/charm_tests/keystone/setup.py
@@ -110,7 +110,7 @@ def add_demo_user():
         # under test other than keystone.
         with _singleton.config_change(
                 {'preferred-api-version': _singleton.default_api_version},
-                {'preferred-api-version': '3'}, application_name="keystone"):
+                {'preferred-api-version': 3}, application_name="keystone"):
             _v3()
     else:
         # create only V3 user
diff --git a/zaza/openstack/charm_tests/keystone/tests.py b/zaza/openstack/charm_tests/keystone/tests.py
index eda5441..e057428 100644
--- a/zaza/openstack/charm_tests/keystone/tests.py
+++ b/zaza/openstack/charm_tests/keystone/tests.py
@@ -321,7 +321,7 @@ class AuthenticationAuthorizationTest(BaseKeystoneTest):
             }
             with self.config_change(
                     {'preferred-api-version': self.default_api_version},
-                    {'preferred-api-version': '3'},
+                    {'preferred-api-version': self.api_v3},
                     application_name="keystone"):
                 for ip in self.keystone_ips:
                     openrc.update(