From 17f6e7f152a25d145ec9fe3bccd431855be94c28 Mon Sep 17 00:00:00 2001 From: Chuan Miao Date: Thu, 21 Feb 2019 10:40:42 +0100 Subject: [PATCH] [NetApp] Support NFS shares on windows Set following 4 attributes when creating nfs shares: showmount: enabled v3-ms-dos-client: support v3-connection-drop: disable ejukebox-errors: disable Change-Id: I86c3de32d36940e85545fcb337723e4b3edce216 Closes-bug: 1901937 Co-authored-by: Maurice Escher (cherry picked from commit 5e01d9e292582bbd1e6a87cec8b92874996585f7) (cherry picked from commit 1af6f4925111a58c15f8ce2789933243f31ffc9f) (cherry picked from commit e08683fab336e431a11239ffc40af2d05602e8c3) --- manila/share/drivers/netapp/dataontap/client/client_cmode.py | 4 ++++ .../drivers/netapp/dataontap/client/test_client_cmode.py | 4 ++++ .../bug-1901937-netapp-nfs-for-windows-465e704524277ea2.yaml | 5 +++++ 3 files changed, 13 insertions(+) create mode 100644 releasenotes/notes/bug-1901937-netapp-nfs-for-windows-465e704524277ea2.yaml diff --git a/manila/share/drivers/netapp/dataontap/client/client_cmode.py b/manila/share/drivers/netapp/dataontap/client/client_cmode.py index 73682dd36a..de3e8be867 100644 --- a/manila/share/drivers/netapp/dataontap/client/client_cmode.py +++ b/manila/share/drivers/netapp/dataontap/client/client_cmode.py @@ -1369,6 +1369,10 @@ class NetAppCmodeClient(client_base.NetAppBaseClient): 'is-nfsv3-enabled': nfs3, 'is-nfsv40-enabled': nfs40, 'is-nfsv41-enabled': nfs41, + 'showmount': 'true', + 'is-v3-ms-dos-client-enabled': 'true', + 'is-nfsv3-connection-drop-enabled': 'false', + 'enable-ejukebox': 'false', } self.send_request('nfs-service-modify', nfs_service_modify_args) diff --git a/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py b/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py index 55b147ce05..cb7638794b 100644 --- a/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py +++ b/manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py @@ -2431,6 +2431,10 @@ class NetAppClientCmodeTestCase(test.TestCase): 'is-nfsv3-enabled': 'true' if v3 else 'false', 'is-nfsv40-enabled': 'true' if v40 else 'false', 'is-nfsv41-enabled': 'true' if v41 else 'false', + 'showmount': 'true', + 'is-v3-ms-dos-client-enabled': 'true', + 'is-nfsv3-connection-drop-enabled': 'false', + 'enable-ejukebox': 'false', } self.client.send_request.assert_called_once_with( 'nfs-service-modify', nfs_service_modify_args) diff --git a/releasenotes/notes/bug-1901937-netapp-nfs-for-windows-465e704524277ea2.yaml b/releasenotes/notes/bug-1901937-netapp-nfs-for-windows-465e704524277ea2.yaml new file mode 100644 index 0000000000..6a254af822 --- /dev/null +++ b/releasenotes/notes/bug-1901937-netapp-nfs-for-windows-465e704524277ea2.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + The NetApp cDOT driver now sets the required NFS options for clients running + Windows operating systems with NFSv3 support.