openstack/cinder
Code Issues Proposed changes

Merge "Remove six from Synology driver"

Browse Source
This commit is contained in:
Zuul 2024-05-20 13:01:59 +00:00 committed by Gerrit Code Review
commit e5297446a9
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cinder/tests/unit/volume/drivers/synology/test_synology_common.py
View File

@ -16,6 +16,7 @@
"""Tests for the Synology iSCSI volume driver."""
import copy
from http import HTTPStatus
import json
import math
from unittest import mock
@ -26,8 +27,6 @@ from cryptography.hazmat.primitives.asymmetric import rsa
import ddt
from oslo_utils import units
import requests
from six.moves import http_client
from six import string_types
from cinder import context
from cinder import exception
@ -155,7 +154,7 @@ class MockResponse(object):
class SynoSessionTestCase(test.TestCase):
@mock.patch('requests.post', return_value=MockResponse(
{'data': {'sid': 'sid'}, 'success': True}, http_client.OK))
{'data': {'sid': 'sid'}, 'success': True}, HTTPStatus.OK))
def setUp(self, _mock_post):
super(SynoSessionTestCase, self).setUp()
@ -196,12 +195,12 @@ class SynoSessionTestCase(test.TestCase):
FAKE_API: out
},
'success': True
}, http_client.OK),
}, HTTPStatus.OK),
MockResponse({
'data': {
FAKE_API: out
}
}, http_client.OK),
}, HTTPStatus.OK),
])
result = self.session.query(FAKE_API)
@ -393,7 +392,7 @@ class SynoAPIRequestTestCase(test.TestCase):
}
self.request._jsonFormat = True
result = self.request._encode_param(param)
self.assertIsInstance(result, string_types)
self.assertIsInstance(result, str)
def test_request(self):
version = 1
@ -402,12 +401,12 @@ class SynoAPIRequestTestCase(test.TestCase):
self.request._encode_param = mock.Mock(side_effect=lambda x: x)
self.request.new_session = mock.Mock()
requests.post = mock.Mock(side_effect=[
MockResponse({'success': True}, http_client.OK),
MockResponse({'error': {'code': http_client.SWITCHING_PROTOCOLS},
'success': False}, http_client.OK),
MockResponse({'error': {'code': http_client.SWITCHING_PROTOCOLS}},
http_client.OK),
MockResponse({}, http_client.INTERNAL_SERVER_ERROR)
MockResponse({'success': True}, HTTPStatus.OK),
MockResponse({'error': {'code': HTTPStatus.SWITCHING_PROTOCOLS},
'success': False}, HTTPStatus.OK),
MockResponse({'error': {'code': HTTPStatus.SWITCHING_PROTOCOLS}},
HTTPStatus.OK),
MockResponse({}, HTTPStatus.INTERNAL_SERVER_ERROR)
])
result = self.request.request(FAKE_API, FAKE_METHOD, version)
@ -415,7 +414,7 @@ class SynoAPIRequestTestCase(test.TestCase):
result = self.request.request(FAKE_API, FAKE_METHOD, version)
self.assertDictEqual(
{'error': {'code': http_client.SWITCHING_PROTOCOLS},
{'error': {'code': HTTPStatus.SWITCHING_PROTOCOLS},
'success': False}, result)
self.assertRaises(exception.MalformedResponse,
@ -426,7 +425,7 @@ class SynoAPIRequestTestCase(test.TestCase):
result = self.request.request(FAKE_API, FAKE_METHOD, version)
self.assertDictEqual(
{'http_status': http_client.INTERNAL_SERVER_ERROR}, result)
{'http_status': HTTPStatus.INTERNAL_SERVER_ERROR}, result)
@mock.patch.object(common.LOG, 'debug')
@ddt.data(105, 119)
@ -440,7 +439,7 @@ class SynoAPIRequestTestCase(test.TestCase):
MockResponse({
'error': {'code': _code},
'success': False
}, http_client.OK))
}, HTTPStatus.OK))
self.assertRaises(common.SynoAuthError,
self.request.request,
@ -1259,7 +1258,7 @@ class SynoCommonTestCase(test.TestCase):
version = 1
resp = {}
bad_resp = {
'http_status': http_client.INTERNAL_SERVER_ERROR
'http_status': HTTPStatus.INTERNAL_SERVER_ERROR
}
expected = copy.deepcopy(resp)
expected.update(api_info={'api': api,

15
cinder/volume/drivers/synology/synology_common.py
View File

@ -20,6 +20,7 @@ import math
from os import urandom
from random import randint
import re
import urllib
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.asymmetric import padding
@ -34,8 +35,6 @@ from oslo_utils import excutils
from oslo_utils.secretutils import md5
from oslo_utils import units
import requests
from six.moves import urllib
from six import string_types
from cinder import exception
from cinder.i18n import _
@ -456,7 +455,7 @@ class SynoCommon(object):
or 0 >= len(out['data']['nodes'])
or not self.check_value_valid(out['data']['nodes'][0],
['uuid'],
string_types)):
str)):
msg = _('Failed to _get_node_uuid.')
raise exception.VolumeDriverException(message=msg)
@ -565,7 +564,7 @@ class SynoCommon(object):
with excutils.save_and_reraise_exception():
LOG.exception('Failed to _get_lun_uuid. [%s]', lun_name)
if not self.check_value_valid(lun_info, ['uuid'], string_types):
if not self.check_value_valid(lun_info, ['uuid'], str):
raise exception.MalformedResponse(cmd='_get_lun_uuid',
reason=_('uuid not found'))
@ -583,7 +582,7 @@ class SynoCommon(object):
with excutils.save_and_reraise_exception():
LOG.exception('Failed to _get_lun_status. [%s]', lun_name)
if not self.check_value_valid(lun_info, ['status'], string_types):
if not self.check_value_valid(lun_info, ['status'], str):
raise exception.MalformedResponse(cmd='_get_lun_status',
reason=_('status not found'))
if not self.check_value_valid(lun_info, ['is_action_locked'], bool):
@ -635,7 +634,7 @@ class SynoCommon(object):
LOG.exception('Failed to _get_snapshot_info. [%s]',
snapshot_uuid)
if not self.check_value_valid(snapshot_info, ['status'], string_types):
if not self.check_value_valid(snapshot_info, ['status'], str):
raise exception.MalformedResponse(cmd='_get_snapshot_status',
reason=_('status not found'))
if not self.check_value_valid(snapshot_info,
@ -869,7 +868,7 @@ class SynoCommon(object):
if not self.check_value_valid(out,
['data', 'firmware_ver'],
string_types):
str):
raise exception.MalformedResponse(cmd='_check_ds_version',
reason=_('data not found'))
firmware_version = out['data']['firmware_ver']
@ -1180,7 +1179,7 @@ class SynoCommon(object):
if not self.check_value_valid(resp,
['data', 'snapshot_uuid'],
string_types):
str):
raise exception.MalformedResponse(cmd='create_snapshot',
reason=_('uuid not found'))