openstack/cinder
Code Issues Proposed changes

Remove six from solidfire driver

Browse Source 
Change-Id: Ica387e62db0e9fbb8f13e82cefdc4b1e71fd047d
This commit is contained in:
Eric Harney
2023-05-02 14:37:40 -04:00
parent ab81fb4c8a
commit fdeb013aca
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/tests/unit/volume/drivers/solidfire/test_solidfire.py
View File

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

4
cinder/volume/drivers/solidfire.py
View File

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