Remove six from solidfire driver

Change-Id: Ica387e62db0e9fbb8f13e82cefdc4b1e71fd047d

cinder/tests/unit/volume/drivers/solidfire/test_solidfire.py

@@ -27,7 +27,6 @@ from ddt import unpack
 from oslo_service import loopingcall
 from oslo_utils import timeutils
 from oslo_utils import units
-import six
 
 from cinder import context
 from cinder import exception
@@ -2833,7 +2832,7 @@ class SolidFireVolumeTestCase(test.TestCase):
         with mock.patch.object(volume_types, 'get_volume_type',
                                return_value=fake_type):
             res = sfv._extract_sf_attributes_from_extra_specs(type_id)
-            six.assertCountEqual(self, expected, res)
+            self.assertCountEqual(expected, res)
 
     def test_build_endpoint_with_kwargs(self):
         sfv = solidfire.SolidFireDriver(configuration=self.configuration)

cinder/volume/drivers/solidfire.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import functools
 import inspect
 import json
 import math
@@ -29,7 +30,6 @@ from oslo_utils import excutils
 from oslo_utils import timeutils
 from oslo_utils import units
 import requests
-import six
 
 from cinder.common import constants
 from cinder import context
@@ -174,7 +174,7 @@ class SolidFireDuplicateVolumeNames(SolidFireDriverException):
 
 def retry(exc_tuple, tries=5, delay=1, backoff=2):
     def retry_dec(f):
-        @six.wraps(f)
+        @functools.wraps(f)
         def func_retry(*args, **kwargs):
             _tries, _delay = tries, delay
             while _tries > 1: