diff --git a/manila/share/drivers/netapp/dataontap/client/client_cmode.py b/manila/share/drivers/netapp/dataontap/client/client_cmode.py index 7736fcdf8b..dd69cf0924 100644 --- a/manila/share/drivers/netapp/dataontap/client/client_cmode.py +++ b/manila/share/drivers/netapp/dataontap/client/client_cmode.py @@ -1389,6 +1389,10 @@ class NetAppCmodeClient(client_base.NetAppBaseClient): 'cifs-server': cifs_server, 'domain': security_service['domain'], } + + if security_service['ou'] is not None: + api_args['organizational-unit'] = security_service['ou'] + try: LOG.debug("Trying to setup CIFS server with data: %s", api_args) self.send_request('cifs-server-create', api_args) diff --git a/manila/tests/share/drivers/netapp/dataontap/client/fakes.py b/manila/tests/share/drivers/netapp/dataontap/client/fakes.py index 1afe6888f4..baa7a7a0ec 100644 --- a/manila/tests/share/drivers/netapp/dataontap/client/fakes.py +++ b/manila/tests/share/drivers/netapp/dataontap/client/fakes.py @@ -418,6 +418,7 @@ CIFS_SECURITY_SERVICE = { 'type': 'active_directory', 'password': 'fake_password', 'user': 'fake_user', + 'ou': 'fake_ou', 'domain': 'fake_domain', 'dns_ip': 'fake_dns_ip', } 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 6405c42a4f..bb07d6b135 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 @@ -2441,6 +2441,7 @@ class NetAppClientCmodeTestCase(test.TestCase): 'admin-password': fake.CIFS_SECURITY_SERVICE['password'], 'force-account-overwrite': 'true', 'cifs-server': cifs_server, + 'organizational-unit': fake.CIFS_SECURITY_SERVICE['ou'], 'domain': fake.CIFS_SECURITY_SERVICE['domain'], } diff --git a/releasenotes/notes/netapp-cdot-use-security-service-ou-4dc5835c9e00ad9d.yaml b/releasenotes/notes/netapp-cdot-use-security-service-ou-4dc5835c9e00ad9d.yaml new file mode 100644 index 0000000000..72630b6518 --- /dev/null +++ b/releasenotes/notes/netapp-cdot-use-security-service-ou-4dc5835c9e00ad9d.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The NetApp cDOT driver uses the ou field from security services to + set the organizational unit of a vserver's active directory + configuration. This is done at CIFS server creation.