openstack/cinder
Code Issues Proposed changes

QNAP: Add support for QES 2.1.0

Browse Source 
This patch do the following change to the QNAP Cinder driver:
1. Add support for QNAP QES firmware 2.1.0.

Change-Id: I6693c9b7efb3bc8b361e55ad84183103a5175298
Implements: blueprint qnap-support-qes-210
This commit is contained in:
Chris Yang 2018-07-19 16:01:37 +08:00
parent 49507ea1c0
commit 4dceb56f88
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,8 @@ class QnapISCSIDriver(san.SanISCSIDriver):
Compression and CHAP. Compression and CHAP.
1.2.002: 1.2.002:
Add support for QES fw 2.0.0. Add support for QES fw 2.0.0.
1.2.003:
Add support for QES fw 2.1.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.
@ -81,7 +83,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
# ThirdPartySystems wiki page # ThirdPartySystems wiki page
CI_WIKI_NAME = "QNAP_CI" CI_WIKI_NAME = "QNAP_CI"
VERSION = '1.2.002' VERSION = '1.2.003'
TIME_INTERVAL = 3 TIME_INTERVAL = 3
@ -208,7 +210,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
password=self.configuration.san_password, password=self.configuration.san_password,
management_url=self.configuration.qnap_management_url, management_url=self.configuration.qnap_management_url,
verify_ssl=self.configuration.driver_ssl_cert_verify)) verify_ssl=self.configuration.driver_ssl_cert_verify))
elif "1.1.2" <= fw_version <= "2.0.9999": elif "1.1.2" <= fw_version <= "2.1.9999":
LOG.debug('Create TES API Executor') LOG.debug('Create TES API Executor')
return (QnapAPIExecutorTES( return (QnapAPIExecutorTES(
username=self.configuration.san_login, username=self.configuration.san_login,
@ -216,7 +218,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
management_url=self.configuration.qnap_management_url, management_url=self.configuration.qnap_management_url,
verify_ssl=self.configuration.driver_ssl_cert_verify)) verify_ssl=self.configuration.driver_ssl_cert_verify))
elif model_type in es_model_types: elif model_type in es_model_types:
if "1.1.2" <= fw_version <= "2.0.9999": if "1.1.2" <= fw_version <= "2.1.9999":
LOG.debug('Create ES API Executor') LOG.debug('Create ES API Executor')
return (QnapAPIExecutor( return (QnapAPIExecutor(
username=self.configuration.san_login, username=self.configuration.san_login,
@ -391,7 +393,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
LOG.debug('in ES FW before 1.1.2/1.1.3: get_lun_info') LOG.debug('in ES FW before 1.1.2/1.1.3: get_lun_info')
del_lun = self.api_executor.get_lun_info( del_lun = self.api_executor.get_lun_info(
LUNIndex=lun_index) LUNIndex=lun_index)
elif "1.1.4" <= fw_version <= "2.0.9999": elif "1.1.4" <= fw_version <= "2.1.9999":
LOG.debug('in ES FW after 1.1.4: get_one_lun_info') LOG.debug('in ES FW after 1.1.4: get_one_lun_info')
ret = self.api_executor.get_one_lun_info(lun_index) ret = self.api_executor.get_one_lun_info(lun_index)
del_lun = (ET.fromstring(ret['data']).find('LUNInfo') del_lun = (ET.fromstring(ret['data']).find('LUNInfo')
@ -830,7 +832,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
LOG.debug('in ES FW before 1.1.2/1.1.3: get_lun_info') LOG.debug('in ES FW before 1.1.2/1.1.3: get_lun_info')
selected_lun = self.api_executor.get_lun_info( selected_lun = self.api_executor.get_lun_info(
LUNNAA=lun_naa) LUNNAA=lun_naa)
elif "1.1.4" <= fw_version <= "2.0.9999": elif "1.1.4" <= fw_version <= "2.1.9999":
LOG.debug('in ES FW after 1.1.4: get_one_lun_info') LOG.debug('in ES FW after 1.1.4: get_one_lun_info')
ret = self.api_executor.get_one_lun_info(lun_index) ret = self.api_executor.get_one_lun_info(lun_index)
selected_lun = (ET.fromstring(ret['data']).find('LUNInfo') selected_lun = (ET.fromstring(ret['data']).find('LUNInfo')
@ -883,7 +885,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
eventlet.sleep(self.TIME_INTERVAL) eventlet.sleep(self.TIME_INTERVAL)
if(try_times > max_wait_sec or LUNNumber != ""): if(try_times > max_wait_sec or LUNNumber != ""):
break break
elif "1.1.4" <= fw_version <= "2.0.9999": elif "1.1.4" <= fw_version <= "2.1.9999":
LOG.debug('in ES FW after 1.1.4: get_one_lun_info') LOG.debug('in ES FW after 1.1.4: get_one_lun_info')
ret = self.api_executor.get_one_lun_info(lun_index) ret = self.api_executor.get_one_lun_info(lun_index)
root = ET.fromstring(ret['data']) root = ET.fromstring(ret['data'])
@ -1029,7 +1031,7 @@ class QnapISCSIDriver(san.SanISCSIDriver):
LOG.debug('in ES FW before 1.1.2/1.1.3: get_lun_info') LOG.debug('in ES FW before 1.1.2/1.1.3: get_lun_info')
selected_lun = self.api_executor.get_lun_info( selected_lun = self.api_executor.get_lun_info(
LUNIndex=lun_index) LUNIndex=lun_index)
elif "1.1.4" <= fw_version <= "2.0.9999": elif "1.1.4" <= fw_version <= "2.1.9999":
LOG.debug('in ES FW after 1.1.4: get_one_lun_info') LOG.debug('in ES FW after 1.1.4: get_one_lun_info')
ret = self.api_executor.get_one_lun_info(lun_index) ret = self.api_executor.get_one_lun_info(lun_index)
selected_lun = (ET.fromstring(ret['data']).find('LUNInfo') selected_lun = (ET.fromstring(ret['data']).find('LUNInfo')

4
releasenotes/notes/qnap-support-qes-210-de75892f684cb9c3.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
QNAP Cinder driver added support for QES fw 2.1.0.