Remove all usage of six library

Convert all code to not require six library and instead
use python 3.x logic.

Change-Id: I0f7d623d58072bc3b7761a3c70832298cbc00de1

requirements.txt

@@ -7,6 +7,5 @@ openstacksdk>=0.24.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
-six>=1.10.0 # MIT
 tempest>=17.1.0 # Apache-2.0
 tenacity>=4.9.0 # Apache-2.0

senlin_tempest_plugin/common/clustering_client.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from six.moves.urllib import parse as urllib
 import time
+from urllib import parse as urllib
 
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils

senlin_tempest_plugin/common/compute_client.py

@@ -14,11 +14,11 @@
 
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
-from six.moves.urllib import parse as urllib
 from tempest import config
 from tempest.lib.common import rest_client
 from tempest.lib import exceptions
 import time
+from urllib import parse as urllib
 
 CONF = config.CONF
 

senlin_tempest_plugin/tests/api/clusters/test_cluster_policy_attach.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import six
 
 from tempest.lib import decorators
 from tempest.lib import exceptions
@@ -128,17 +127,12 @@ class TestClusterPolicyAttachNegativePolicyNotFound(base.BaseSenlinAPITest):
                                'clusters', self.cluster_id, params)
 
         message = ex.resp_body['error']['message']
-        if six.PY2:
+        if 'required' in str(message):
+            self.assertEqual("'policy_id' is a required property",
+                             str(message))
+        else:
             self.assertIn("Additional properties are not allowed",
                           str(message))
-        else:
-            # Python3 performs validation in unpredictable orders
-            if 'required' in str(message):
-                self.assertEqual("'policy_id' is a required property",
-                                 str(message))
-            else:
-                self.assertIn("Additional properties are not allowed",
-                              str(message))
 
 
 class TestClusterPolicyAttachNegativeNotFound(base.BaseSenlinAPITest):

senlin_tempest_plugin/tests/integration/test_nova_server_cluster.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import six
 
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
@@ -68,7 +67,7 @@ class TestNovaServerCluster(base.BaseSenlinIntegrationNonAdminTest):
                 metadata = {
                     'cluster_id': cluster['id'],
                     'cluster_node_id': node['id'],
-                    'cluster_node_index': six.text_type(node['index'])
+                    'cluster_node_index': str(node['index'])
                 }
                 self.assertEqual(metadata, node['details']['metadata'])
         finally: