Skip to content

Commit f80ecfe

Browse files
imduffy15imduffy15
committed
Cloudstack-2014 [GSoC] Add support for ldap user provisioning
2 parents fb7eb06 + 7ded3c8 commit f80ecfe

80 files changed

Lines changed: 5286 additions & 1448 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,5 @@ debian/*.debhelper
8181
replace.properties.tmp
8282
build-indep-stamp
8383
configure-stamp
84-
*_flymake.js
84+
*_flymake.js
85+
engine/storage/integration-test/test-output

‎api/src/com/cloud/configuration/ConfigurationService.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import javax.naming.NamingException;
2222

2323
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
24-
import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
25-
import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
2624
import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
2725
import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
2826
import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
@@ -261,12 +259,6 @@ public interface ConfigurationService {
261259

262260
Long getDefaultPageSize();
263261

264-
boolean updateLDAP(LDAPConfigCmd cmd) throws NamingException;
265-
266-
boolean removeLDAP(LDAPRemoveCmd cmd);
267-
268-
LDAPConfigCmd listLDAPConfig(LDAPConfigCmd cmd);
269-
270262
PortableIpRange createPortableIpRange(CreatePortableIpRangeCmd cmd) throws ConcurrentOperationException;
271263

272264
boolean deletePortableIpRange(DeletePortableIpRangeCmd cmd);

‎api/src/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -525,15 +525,4 @@ public enum HostDetails {
525525
public enum VMDetails {
526526
all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp;
527527
}
528-
529-
public enum LDAPParams {
530-
hostname, port, usessl, queryfilter, searchbase, dn, passwd, truststore, truststorepass;
531-
532-
@Override
533-
public String toString() {
534-
return "ldap." + name();
535-
}
536-
}
537-
538-
539528
}

‎api/src/org/apache/cloudstack/api/LdapValidator.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.apache.cloudstack.api;
2+
3+
public interface LdapValidator {
4+
boolean isLdapEnabled();
5+
}

‎api/src/org/apache/cloudstack/api/ResponseGenerator.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import org.apache.cloudstack.api.response.IsolationMethodResponse;
6161
import org.apache.cloudstack.api.response.LBHealthCheckResponse;
6262
import org.apache.cloudstack.api.response.LBStickinessResponse;
63-
import org.apache.cloudstack.api.response.LDAPConfigResponse;
6463
import org.apache.cloudstack.api.response.LoadBalancerResponse;
6564
import org.apache.cloudstack.api.response.NetworkACLItemResponse;
6665
import org.apache.cloudstack.api.response.NetworkACLResponse;
@@ -354,8 +353,6 @@ LBHealthCheckResponse createLBHealthCheckPolicyResponse(List<? extends HealthChe
354353

355354
VirtualRouterProviderResponse createVirtualRouterProviderResponse(VirtualRouterProvider result);
356355

357-
LDAPConfigResponse createLDAPConfigResponse(String hostname, Integer port, Boolean useSSL, String queryFilter, String baseSearch, String dn);
358-
359356
StorageNetworkIpRangeResponse createStorageNetworkIpRangeResponse(StorageNetworkIpRange result);
360357

361358
RegionResponse createRegionResponse(Region region);

‎api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java‎

Lines changed: 0 additions & 205 deletions
This file was deleted.

‎api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)