From 5bd44e0be35a8710dd0e5ad9c35f924b0199e971 Mon Sep 17 00:00:00 2001 From: Sam Wan Date: Tue, 17 Aug 2021 12:01:44 +0800 Subject: [PATCH] Change cifs value from string to list for Dell manila drivers Dell manila drivers use string as value for 'cifs' in dhss_mandatory_security_service_association. This fix changes it to a list. Change-Id: I0c64e574301baf2a41a475af3b3848cbec8d495f Closes-Bug: #1940072 --- manila/share/drivers/dell_emc/plugins/powermax/connection.py | 2 +- manila/share/drivers/dell_emc/plugins/unity/connection.py | 2 +- manila/share/drivers/dell_emc/plugins/vnx/connection.py | 2 +- ...072-dell-manila-fix-cifs-value-type-f65e162ee27d3e67.yaml | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/bug-1940072-dell-manila-fix-cifs-value-type-f65e162ee27d3e67.yaml diff --git a/manila/share/drivers/dell_emc/plugins/powermax/connection.py b/manila/share/drivers/dell_emc/plugins/powermax/connection.py index 96a9932963..900f58328d 100644 --- a/manila/share/drivers/dell_emc/plugins/powermax/connection.py +++ b/manila/share/drivers/dell_emc/plugins/powermax/connection.py @@ -86,7 +86,7 @@ class PowerMaxStorageConnection(driver.StorageConnection): self.ipv6_implemented = True self.dhss_mandatory_security_service_association = { 'nfs': None, - 'cifs': 'active_directory', + 'cifs': ['active_directory', ] } def create_share(self, context, share, share_server=None): diff --git a/manila/share/drivers/dell_emc/plugins/unity/connection.py b/manila/share/drivers/dell_emc/plugins/unity/connection.py index cb92013415..ae40a8e58f 100644 --- a/manila/share/drivers/dell_emc/plugins/unity/connection.py +++ b/manila/share/drivers/dell_emc/plugins/unity/connection.py @@ -109,7 +109,7 @@ class UnityStorageConnection(driver.StorageConnection): self.driver_handles_share_servers = (True, False) self.dhss_mandatory_security_service_association = { 'nfs': None, - 'cifs': 'active_directory', + 'cifs': ['active_directory', ] } def connect(self, emc_share_driver, context): diff --git a/manila/share/drivers/dell_emc/plugins/vnx/connection.py b/manila/share/drivers/dell_emc/plugins/vnx/connection.py index 6f0e56ef33..60b3c4ff91 100644 --- a/manila/share/drivers/dell_emc/plugins/vnx/connection.py +++ b/manila/share/drivers/dell_emc/plugins/vnx/connection.py @@ -83,7 +83,7 @@ class VNXStorageConnection(driver.StorageConnection): self.ipv6_implemented = True self.dhss_mandatory_security_service_association = { 'nfs': None, - 'cifs': 'active_directory', + 'cifs': ['active_directory', ] } def create_share(self, context, share, share_server=None): diff --git a/releasenotes/notes/bug-1940072-dell-manila-fix-cifs-value-type-f65e162ee27d3e67.yaml b/releasenotes/notes/bug-1940072-dell-manila-fix-cifs-value-type-f65e162ee27d3e67.yaml new file mode 100644 index 0000000000..831e145835 --- /dev/null +++ b/releasenotes/notes/bug-1940072-dell-manila-fix-cifs-value-type-f65e162ee27d3e67.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Change cifs value from string to list for Dell manila drivers. + Fixed `bug 1940072 `_