summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-08 13:23:24 +0000
committerGerrit Code Review <review@openstack.org>2018-08-08 13:23:24 +0000
commita17c89ff0875305e4e90ccc45a696aae9d3864dd (patch)
tree5004aaccbf0e86b2381bbccc65e6dea345ff9cfc
parente2d4e08324a3c9a870655acd6eb2f9e7528c30eb (diff)
parent4c8980029a30ef72f24ad6e027cb265d70e2e236 (diff)
Merge "NetApp cDOT: use security service ou"7.0.0.0rc17.0.0
-rw-r--r--manila/share/drivers/netapp/dataontap/client/client_cmode.py4
-rw-r--r--manila/tests/share/drivers/netapp/dataontap/client/fakes.py1
-rw-r--r--manila/tests/share/drivers/netapp/dataontap/client/test_client_cmode.py1
-rw-r--r--releasenotes/notes/netapp-cdot-use-security-service-ou-4dc5835c9e00ad9d.yaml6
4 files changed, 12 insertions, 0 deletions
diff --git a/manila/share/drivers/netapp/dataontap/client/client_cmode.py b/manila/share/drivers/netapp/dataontap/client/client_cmode.py
index 7736fcd..dd69cf0 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):
1389 'cifs-server': cifs_server, 1389 'cifs-server': cifs_server,
1390 'domain': security_service['domain'], 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 try: 1396 try:
1393 LOG.debug("Trying to setup CIFS server with data: %s", api_args) 1397 LOG.debug("Trying to setup CIFS server with data: %s", api_args)
1394 self.send_request('cifs-server-create', api_args) 1398 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 1afe688..baa7a7a 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 = {
418 'type': 'active_directory', 418 'type': 'active_directory',
419 'password': 'fake_password', 419 'password': 'fake_password',
420 'user': 'fake_user', 420 'user': 'fake_user',
421 'ou': 'fake_ou',
421 'domain': 'fake_domain', 422 'domain': 'fake_domain',
422 'dns_ip': 'fake_dns_ip', 423 'dns_ip': 'fake_dns_ip',
423} 424}
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 6405c42..bb07d6b 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):
2441 'admin-password': fake.CIFS_SECURITY_SERVICE['password'], 2441 'admin-password': fake.CIFS_SECURITY_SERVICE['password'],
2442 'force-account-overwrite': 'true', 2442 'force-account-overwrite': 'true',
2443 'cifs-server': cifs_server, 2443 'cifs-server': cifs_server,
2444 'organizational-unit': fake.CIFS_SECURITY_SERVICE['ou'],
2444 'domain': fake.CIFS_SECURITY_SERVICE['domain'], 2445 'domain': fake.CIFS_SECURITY_SERVICE['domain'],
2445 } 2446 }
2446 2447
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 0000000..72630b6
--- /dev/null
+++ b/releasenotes/notes/netapp-cdot-use-security-service-ou-4dc5835c9e00ad9d.yaml
@@ -0,0 +1,6 @@
1---
2features:
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.