Browse Source

Merge "NetApp cDOT: use security service ou"

Zuul 8 months ago
parent
commit
a17c89ff08

+ 4
- 0
manila/share/drivers/netapp/dataontap/client/client_cmode.py View File

@@ -1389,6 +1389,10 @@ class NetAppCmodeClient(client_base.NetAppBaseClient):
1389 1389
             'cifs-server': cifs_server,
1390 1390
             'domain': security_service['domain'],
1391 1391
         }
1392
+
1393
+        if security_service['ou'] is not None:
1394
+            api_args['organizational-unit'] = security_service['ou']
1395
+
1392 1396
         try:
1393 1397
             LOG.debug("Trying to setup CIFS server with data: %s", api_args)
1394 1398
             self.send_request('cifs-server-create', api_args)

+ 1
- 0
manila/tests/share/drivers/netapp/dataontap/client/fakes.py View File

@@ -418,6 +418,7 @@ CIFS_SECURITY_SERVICE = {
418 418
     'type': 'active_directory',
419 419
     'password': 'fake_password',
420 420
     'user': 'fake_user',
421
+    'ou': 'fake_ou',
421 422
     'domain': 'fake_domain',
422 423
     'dns_ip': 'fake_dns_ip',
423 424
 }

+ 1
- 0
manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py View File

@@ -2441,6 +2441,7 @@ class NetAppClientCmodeTestCase(test.TestCase):
2441 2441
             'admin-password': fake.CIFS_SECURITY_SERVICE['password'],
2442 2442
             'force-account-overwrite': 'true',
2443 2443
             'cifs-server': cifs_server,
2444
+            'organizational-unit': fake.CIFS_SECURITY_SERVICE['ou'],
2444 2445
             'domain': fake.CIFS_SECURITY_SERVICE['domain'],
2445 2446
         }
2446 2447
 

+ 6
- 0
releasenotes/notes/netapp-cdot-use-security-service-ou-4dc5835c9e00ad9d.yaml View File

@@ -0,0 +1,6 @@
1
+---
2
+features:
3
+  - |
4
+    The NetApp cDOT driver uses the ou field from security services to
5
+    set the organizational unit of a vserver's active directory
6
+    configuration. This is done at CIFS server creation.

Loading…
Cancel
Save