From e675206288273a45cb8d18a98ab275adf4c79a87 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 8 Feb 2024 21:47:21 +0900
Subject: [PATCH] Remove six

This plugin no longer supports python 2 thus usage of six is no longer
needed.

Change-Id: Ifec8c68edc0c67f0dae937a9cf48598b5725d3f6
---
 cloudkitty_tempest_plugin/services/client.py | 15 +++++++--------
 cloudkitty_tempest_plugin/tests/api/base.py  |  3 +--
 requirements.txt                             |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/cloudkitty_tempest_plugin/services/client.py b/cloudkitty_tempest_plugin/services/client.py
index 7ca322a..cbe57e7 100644
--- a/cloudkitty_tempest_plugin/services/client.py
+++ b/cloudkitty_tempest_plugin/services/client.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-import six
 
 from keystoneauth1.identity import v3
 from keystoneauth1 import session
@@ -211,7 +210,7 @@ class RatingClientV1(BaseRatingClient):
         args.pop('self')
         uri = '/rating/module_config/hashmap/mappings/'
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return self._do_request('GET', uri,
                                 body=self.serialize(request_body))
 
@@ -226,7 +225,7 @@ class RatingClientV1(BaseRatingClient):
         args.pop('self')
         uri = '/rating/module_config/hashmap/mappings/'
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return self._do_request('POST', uri,
                                 body=self.serialize(request_body),
                                 expected_code=201)
@@ -247,7 +246,7 @@ class RatingClientV1(BaseRatingClient):
         args.pop('self')
         uri = '/rating/module_config/hashmap/mappings/'
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return self._do_request('PUT', uri,
                                 body=self.serialize(request_body),
                                 expected_code=302)
@@ -312,7 +311,7 @@ class RatingClientV1(BaseRatingClient):
         args.pop('self')
         uri = '/rating/module_config/hashmap/thresholds/'
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return self._do_request('GET', uri,
                                 body=self.serialize(request_body))
 
@@ -323,7 +322,7 @@ class RatingClientV1(BaseRatingClient):
         args.pop('self')
         uri = '/rating/module_config/hashmap/thresholds/'
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return self._do_request('POST', uri,
                                 body=self.serialize(request_body),
                                 expected_code=201)
@@ -335,7 +334,7 @@ class RatingClientV1(BaseRatingClient):
         args.pop('self')
         uri = '/rating/module_config/hashmap/thresholds/'
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return self._do_request('PUT', uri,
                                 body=self.serialize(request_body),
                                 expected_code=302)
@@ -364,7 +363,7 @@ class RatingClientV1(BaseRatingClient):
     def _get_pyscript_request_body(name, data, checksum, script_id):
         args = locals()
         request_body = dict((k, v)
-                            for k, v in six.iteritems(args) if v is not None)
+                            for k, v in args.items() if v is not None)
         return request_body
 
     def create_pyscript(self, name, data, checksum=None, script_id=None):
diff --git a/cloudkitty_tempest_plugin/tests/api/base.py b/cloudkitty_tempest_plugin/tests/api/base.py
index e466c1e..c08dcdb 100644
--- a/cloudkitty_tempest_plugin/tests/api/base.py
+++ b/cloudkitty_tempest_plugin/tests/api/base.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-import six
 
 from tempest import config
 from tempest.lib import exceptions
@@ -74,7 +73,7 @@ class BaseRatingTest(tempest.test.BaseTestCase):
     @classmethod
     def resource_cleanup(cls):
         super(BaseRatingTest, cls).resource_cleanup()
-        for method, item_ids in six.iteritems(cls._created_resources):
+        for method, item_ids in cls._created_resources.items():
             delete_method = 'delete_' + method
             delete_method = getattr(cls.rating_client, delete_method)
             for item_id in item_ids:
diff --git a/requirements.txt b/requirements.txt
index 72497c1..099b5fc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,5 +7,4 @@ oslo.config>=3.18.0 # Apache-2.0
 oslo.serialization>=2.14.0 # Apache-2.0
 pbr>=2.0 # Apache-2.0
 python-keystoneclient>=3.6.0 # Apache-2.0
-six>=1.9.0 # MIT
 tempest>=15.0.0 # Apache-2.0