From 69b88102649e7dc387d0f9acdf74d033e21664ca Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 28 Dec 2017 17:02:08 +0800 Subject: [PATCH] QNAP: Add support for QES 2.0.0 This patch do the following change to the QNAP Manila driver: 1. Add support for QNAP QES firmware 2.0.0. Change-Id: Ifd4a1f042cd35fc0b2fd77fa8602a9aead65bc62 Implements: blueprint qnap-support-qes-200 --- manila/share/drivers/qnap/qnap.py | 7 ++++--- .../notes/qnap-support-qes-200-639f3ad70687023d.yaml | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/qnap-support-qes-200-639f3ad70687023d.yaml diff --git a/manila/share/drivers/qnap/qnap.py b/manila/share/drivers/qnap/qnap.py index 1a67a0eb4d..1546e4fb4c 100644 --- a/manila/share/drivers/qnap/qnap.py +++ b/manila/share/drivers/qnap/qnap.py @@ -69,9 +69,10 @@ class QnapShareDriver(driver.ShareDriver): override by the another access rule. 1.0.3 - Add supports for Thin Provisioning, SSD Cache, Deduplication and Compression. + 1.0.4 - Add support for QES fw 2.0.0. """ - DRIVER_VERSION = '1.0.3' + DRIVER_VERSION = '1.0.4' def __init__(self, *args, **kwargs): """Initialize QnapShareDriver.""" @@ -160,14 +161,14 @@ class QnapShareDriver(driver.ShareDriver): username=self.configuration.qnap_nas_login, password=self.configuration.qnap_nas_password, management_url=self.configuration.qnap_management_url) - elif "1.1.2" <= fw_version <= "1.1.4": + elif "1.1.2" <= fw_version <= "2.0.9999": LOG.debug('Create ES API Executor') return api.QnapAPIExecutor( username=self.configuration.qnap_nas_login, password=self.configuration.qnap_nas_password, management_url=self.configuration.qnap_management_url) elif model_type in es_model_types: - if "1.1.2" <= fw_version <= "1.1.4": + if "1.1.2" <= fw_version <= "2.0.9999": LOG.debug('Create ES API Executor') return api.QnapAPIExecutor( username=self.configuration.qnap_nas_login, diff --git a/releasenotes/notes/qnap-support-qes-200-639f3ad70687023d.yaml b/releasenotes/notes/qnap-support-qes-200-639f3ad70687023d.yaml new file mode 100644 index 0000000000..8f3da4a3db --- /dev/null +++ b/releasenotes/notes/qnap-support-qes-200-639f3ad70687023d.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + QNAP Manila driver added support for QES fw 2.0.0.