Adding listall to listLdapConfigurations

Author: davidjumani

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java

@@ -55,6 +55,10 @@ public class LdapListConfigurationCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
     private Long domainId;
 
+    @Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN, description = "If set to true, "
+    + " and no domainid specified, list all LDAP configurations irrespective of the linked domain", since = "4.13.2")
+    private Boolean listAll;
+
     public LdapListConfigurationCmd() {
         super();
     }
@@ -117,4 +121,8 @@ public void setPort(final int port) {
     public void setDomainId(final Long domainId) {
         this.domainId = domainId;
     }
+
+    public boolean listAll() {
+        return listAll != null && listAll;
+    }
 }

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java

@@ -291,7 +291,8 @@ public Pair<List<? extends LdapConfigurationVO>, Integer> listConfigurations(fin
         final String hostname = cmd.getHostname();
         final int port = cmd.getPort();
         final Long domainId = cmd.getDomainId();
-        final Pair<List<LdapConfigurationVO>, Integer> result = _ldapConfigurationDao.searchConfigurations(hostname, port, domainId);
+        final boolean listAll = cmd.listAll();
+        final Pair<List<LdapConfigurationVO>, Integer> result = _ldapConfigurationDao.searchConfigurations(hostname, port, domainId, listAll);
         return new Pair<List<? extends LdapConfigurationVO>, Integer>(result.first(), result.second());
     }
 

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java

@@ -37,5 +37,9 @@ public interface LdapConfigurationDao extends GenericDao<LdapConfigurationVO, Lo
 
     LdapConfigurationVO find(String hostname, int port, Long domainId);
 
+    LdapConfigurationVO find(String hostname, int port, Long domainId, boolean listAll);
+
     Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(String hostname, int port, Long domainId);
+
+    Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(String hostname, int port, Long domainId, boolean listAll);
 }

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDaoImpl.java

@@ -46,6 +46,7 @@ public LdapConfigurationDaoImpl() {
         listGlobalConfigurationsSearch.and("port", listGlobalConfigurationsSearch.entity().getPort(), Op.EQ);
         listGlobalConfigurationsSearch.and("domain_id", listGlobalConfigurationsSearch.entity().getDomainId(),SearchCriteria.Op.NULL);
         listGlobalConfigurationsSearch.done();
+
         listDomainConfigurationsSearch = createSearchBuilder();
         listDomainConfigurationsSearch.and("hostname", listDomainConfigurationsSearch.entity().getHostname(), Op.EQ);
         listDomainConfigurationsSearch.and("port", listDomainConfigurationsSearch.entity().getPort(), Op.EQ);
@@ -62,23 +63,44 @@ public LdapConfigurationVO findByHostname(final String hostname) {
 
     @Override
     public LdapConfigurationVO find(String hostname, int port, Long domainId) {
-        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(hostname, port, domainId);
+        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(hostname, port, domainId, false);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public LdapConfigurationVO find(String hostname, int port, Long domainId, boolean listAll) {
+        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(hostname, port, domainId, listAll);
         return findOneBy(sc);
     }
 
     @Override
     public Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(final String hostname, final int port, final Long domainId) {
-        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(hostname, port, domainId);
+        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(hostname, port, domainId, false);
         return searchAndCount(sc, null);
     }
 
-    private SearchCriteria<LdapConfigurationVO> getSearchCriteria(String hostname, int port, Long domainId) {
+    @Override
+    public Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(final String hostname, final int port, final Long domainId, final boolean listAll) {
+        SearchCriteria<LdapConfigurationVO> sc = getSearchCriteria(hostname, port, domainId, listAll);
+        return searchAndCount(sc, null);
+    }
+
+    private SearchCriteria<LdapConfigurationVO> getSearchCriteria(String hostname, int port, Long domainId,boolean listAll) {
         SearchCriteria<LdapConfigurationVO> sc;
+<<<<<<< HEAD
         if (domainId == null) {
             sc = listDomainConfigurationsSearch.create();
         } else {
+=======
+        if (domainId != null) {
+            // If domainid is present, ignore listall
+>>>>>>> 1422ef8cf8... Adding listall to listLdapConfigurations
             sc = listDomainConfigurationsSearch.create();
             sc.setParameters("domain_id", domainId);
+        } else if (listAll) {
+            sc = listDomainConfigurationsSearch.create();
+        } else {
+            sc = listGlobalConfigurationsSearch.create();
         }
         if (hostname != null) {
             sc.setParameters("hostname", hostname);