openstack/cinder
Code Issues Proposed changes

QNAP: Add support for QTS 4.4.0

Browse Source 
This patch adds support for QNAP QTS firmware 4.4.0 to the QNAP
Cinder driver.

Change-Id: I191d630b8c730feb50e7eb80f514a0d3b6261dee
This commit is contained in:
Chris Yang 2019-01-24 16:29:16 +08:00
parent a8d995c2f2
commit fa9881a891
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/test_qnap.py
View File

@ -4735,6 +4735,7 @@ class QnapAPIExecutorTsTestCase(QnapDriverBaseTestCase):
fake_params['poolID'] = 'fakepool' fake_params['poolID'] = 'fakepool'
fake_params['lv_ifssd'] = 'no' fake_params['lv_ifssd'] = 'no'
fake_params['LUNCapacity'] = 100 fake_params['LUNCapacity'] = 100
fake_params['LUNSectorSize'] = '512'
fake_params['lv_threshold'] = '80' fake_params['lv_threshold'] = '80'
fake_params['sid'] = 'fakeSid' fake_params['sid'] = 'fakeSid'
@ -4792,6 +4793,7 @@ class QnapAPIExecutorTsTestCase(QnapDriverBaseTestCase):
fake_params['poolID'] = 'fakepool' fake_params['poolID'] = 'fakepool'
fake_params['lv_ifssd'] = 'no' fake_params['lv_ifssd'] = 'no'
fake_params['LUNCapacity'] = 100 fake_params['LUNCapacity'] = 100
fake_params['LUNSectorSize'] = '512'
fake_params['lv_threshold'] = '80' fake_params['lv_threshold'] = '80'
fake_params['sid'] = 'fakeSid' fake_params['sid'] = 'fakeSid'

9
cinder/volume/drivers/qnap.py
View File

@ -77,6 +77,8 @@ class QnapISCSIDriver(san.SanISCSIDriver):
Add support for QES fw 2.1.0. Add support for QES fw 2.1.0.
1.2.004: 1.2.004:
Add support for QES fw on TDS series NAS model. Add support for QES fw on TDS series NAS model.
1.2.005:
Add support for QTS fw 4.4.0.
NOTE: Set driver_ssl_cert_verify as True under backend section to NOTE: Set driver_ssl_cert_verify as True under backend section to
enable SSL verification. enable SSL verification.
@ -85,7 +87,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
# ThirdPartySystems wiki page # ThirdPartySystems wiki page
CI_WIKI_NAME = "QNAP_CI" CI_WIKI_NAME = "QNAP_CI"
VERSION = '1.2.004' VERSION = '1.2.005'
TIME_INTERVAL = 3 TIME_INTERVAL = 3
@ -187,7 +189,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
] ]
LOG.debug('fw_version: %s', fw_version) LOG.debug('fw_version: %s', fw_version)
if model_type in ts_model_types: if model_type in ts_model_types:
if (fw_version >= "4.2") and (fw_version <= "4.4"): if (fw_version >= "4.2") and (fw_version <= "4.4.9999"):
LOG.debug('Create TS API Executor') LOG.debug('Create TS API Executor')
# modify the pool name to pool index # modify the pool name to pool index
self.configuration.qnap_poolname = ( self.configuration.qnap_poolname = (
@ -201,7 +203,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
verify_ssl=self.configuration.driver_ssl_cert_verify)) verify_ssl=self.configuration.driver_ssl_cert_verify))
elif model_type in tes_model_types: elif model_type in tes_model_types:
if 'TS' in internal_model_name: if 'TS' in internal_model_name:
if (fw_version >= "4.2") and (fw_version <= "4.4"): if (fw_version >= "4.2") and (fw_version <= "4.4.9999"):
LOG.debug('Create TS API Executor') LOG.debug('Create TS API Executor')
# modify the pool name to poole index # modify the pool name to poole index
self.configuration.qnap_poolname = ( self.configuration.qnap_poolname = (
@ -1817,6 +1819,7 @@ class QnapAPIExecutorTS(QnapAPIExecutor):
poolID=pool_name, poolID=pool_name,
lv_ifssd='yes' if ssd_cache else 'no', lv_ifssd='yes' if ssd_cache else 'no',
LUNCapacity=volume['size'], LUNCapacity=volume['size'],
LUNSectorSize='512',
lv_threshold='80', lv_threshold='80',
sid=self.sid) sid=self.sid)
finally: finally:

4
releasenotes/notes/qnap-support-qts-440-c482f109694cb77f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Added support for QTS fw 4.4.0 to QNAP Cinder driver.