Merge pull request #801 from geethkokila/master

Fixing the task for all the tenants

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java

@@ -420,5 +420,7 @@ public interface DeviceDAO {
      */
     List<EnrolmentInfo> getEnrolmentsByStatus(List<DeviceIdentifier> deviceIds, Status status,
                                               int tenantId) throws DeviceManagementDAOException;
+
+    List<Integer> getDeviceEnrolledTenants() throws DeviceManagementDAOException;
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java

@@ -1071,4 +1071,27 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         return devices;
     }
 
+
+    public List<Integer> getDeviceEnrolledTenants() throws DeviceManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        List<Integer> tenants = new ArrayList<>();
+        try {
+            conn = this.getConnection();
+            String sql = "SELECT distinct(TENANT_ID) FROM DM_DEVICE";
+            stmt = conn.prepareStatement(sql);
+            rs = stmt.executeQuery();
+            while (rs.next()) {
+                tenants.add(rs.getInt("TENANT_ID"));
+            }
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while retrieving tenants which have " +
+                    "device registered.", e);
+        } finally {
+            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+        }
+        return tenants;
+    }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java

@@ -558,4 +558,6 @@ public interface DeviceManagementProviderService {
      */
     boolean changeDeviceStatus(DeviceIdentifier deviceIdentifier, EnrolmentInfo.Status newStatus)
             throws DeviceManagementException;
+
+    List<Integer> getDeviceEnrolledTenants() throws DeviceManagementException;
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -1468,6 +1468,21 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         return isDeviceUpdated;
     }
 
+    @Override
+    public List<Integer> getDeviceEnrolledTenants() throws DeviceManagementException {
+        try {
+            DeviceManagementDAOFactory.openConnection();
+            return deviceDAO.getDeviceEnrolledTenants();
+        } catch (DeviceManagementDAOException e) {
+            throw new DeviceManagementException("Error occurred while retrieving the tenants " +
+                    "which have device enrolled.", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
+    }
+
     private boolean updateEnrollment(int deviceId, EnrolmentInfo enrolmentInfo, int tenantId)
             throws DeviceManagementException {
         boolean isUpdatedEnrollment = false;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java

@@ -22,20 +22,26 @@ package org.wso2.carbon.device.mgt.core.task.impl;
 import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.task.DeviceMgtTaskException;
 import org.wso2.carbon.device.mgt.core.task.DeviceTaskManager;
 import org.wso2.carbon.ntask.core.Task;
+import org.wso2.carbon.user.api.UserStoreException;
 
+import java.util.List;
 import java.util.Map;
 
 public class DeviceDetailsRetrieverTask implements Task {
 
     private static Log log = LogFactory.getLog(DeviceDetailsRetrieverTask.class);
-//    private DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl();
     private String deviceType;
     private String oppConfig;
     private OperationMonitoringTaskConfig operationMonitoringTaskConfig;
+    private boolean executeForTenants = false;
+    private final String IS_CLOUD = "is.cloud";
 
     @Override
     public void setProperties(Map<String, String> map) {
@@ -54,21 +60,62 @@ public class DeviceDetailsRetrieverTask implements Task {
 
     @Override
     public void execute() {
-        if (log.isDebugEnabled()) {
+
-            log.debug("Device details retrieving task started to run.");
+        if(System.getProperty(IS_CLOUD) != null && Boolean.parseBoolean(System.getProperty(IS_CLOUD))){
+            executeForTenants = true;
         }
+        if(executeForTenants){
+            this.executeForAllTenants();
+        } else {
+            if (log.isDebugEnabled()) {
+                log.debug("Device details retrieving task started to run.");
+            }
+            DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType,
+                    operationMonitoringTaskConfig);
+            //pass the configurations also from here, monitoring tasks
+            try {
+                deviceTaskManager.addOperations();
+            } catch (DeviceMgtTaskException e) {
+                log.error(
+                        "Error occurred while trying to add the operations to device to retrieve device details.", e);
+            }
+        }
+    }
 
-        DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType,
+    private void executeForAllTenants() {
-                operationMonitoringTaskConfig);
+
-        //pass the configurations also from here, monitoring tasks
+        if (log.isDebugEnabled()) {
+            log.debug("Device details retrieving task started to run for all tenants.");
+        }
         try {
-            deviceTaskManager.addOperations();
+            List<Integer> tenants = DeviceManagementDataHolder.getInstance().
-        } catch (DeviceMgtTaskException e) {
+                    getDeviceManagementProvider().getDeviceEnrolledTenants();
-            log.error(
+            for (Integer tenant : tenants) {
-                    "Error occurred while trying to add the operations to device to retrieve device details.",
+                String tenantDomain = DeviceManagementDataHolder.getInstance().
-                    e);
+                        getRealmService().getTenantManager().getDomain(tenant);
+                try {
+                    PrivilegedCarbonContext.startTenantFlow();
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain);
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant);
+                    DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType,
+                            operationMonitoringTaskConfig);
+                    //pass the configurations also from here, monitoring tasks
+                    try {
+                        deviceTaskManager.addOperations();
+                    } catch (DeviceMgtTaskException e) {
+                        log.error("Error occurred while trying to add the operations to " +
+                                "device to retrieve device details.", e);
+                    }
+                } finally {
+                    PrivilegedCarbonContext.endTenantFlow();
+                }
+            }
+        } catch (UserStoreException e) {
+            log.error("Error occurred while trying to get the available tenants", e);
+        } catch (DeviceManagementException e) {
+            log.error("Error occurred while trying to get the available tenants " +
+                    "from device manager provider service.", e);
         }
-
     }
 
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java

@@ -21,14 +21,18 @@ package org.wso2.carbon.policy.mgt.core.task;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
 import org.wso2.carbon.ntask.core.Task;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
+import org.wso2.carbon.user.api.UserStoreException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +43,8 @@ public class MonitoringTask implements Task {
     private static Log log = LogFactory.getLog(MonitoringTask.class);
 
     Map<String, String> properties;
+    private boolean executeForTenants = false;
+    private final String IS_CLOUD = "is.cloud";
 
 
     @Override
@@ -56,6 +62,61 @@ public class MonitoringTask implements Task {
         if (log.isDebugEnabled()) {
             log.debug("Monitoring task started to run.");
         }
+        if(System.getProperty(IS_CLOUD) != null && Boolean.parseBoolean(System.getProperty(IS_CLOUD))){
+            executeForTenants = true;
+        }
+        if(executeForTenants) {
+            this.executeforAllTenants();
+        } else {
+            this.executeTask();
+        }
+    }
+
+    /**
+     * Check whether Device platform (ex: android) is exist in the cdm-config.xml file before adding a
+     * Monitoring operation to a specific device type.
+     *
+     * @param deviceType available device types.
+     * @return return platform is exist(true) or not (false).
+     */
+
+    private boolean isPlatformExist(String deviceType) {
+        PolicyMonitoringManager policyMonitoringManager = PolicyManagementDataHolder.getInstance()
+                .getDeviceManagementService().getPolicyMonitoringManager(deviceType);
+        if (policyMonitoringManager != null) {
+            return true;
+        }
+        return false;
+    }
+
+    private void executeforAllTenants() {
+
+        if (log.isDebugEnabled()) {
+            log.debug("Monitoring task started to run for all tenants.");
+        }
+        try {
+            DeviceManagementProviderService deviceManagementService = new DeviceManagementProviderServiceImpl();
+            List<Integer> tenants = deviceManagementService.getDeviceEnrolledTenants();
+            for (Integer tenant : tenants) {
+                String tenantDomain = PolicyManagementDataHolder.getInstance().
+                        getRealmService().getTenantManager().getDomain(tenant);
+                try {
+                    PrivilegedCarbonContext.startTenantFlow();
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain);
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant);
+                    this.executeTask();
+                } finally {
+                    PrivilegedCarbonContext.endTenantFlow();
+                }
+            }
+        } catch (UserStoreException e) {
+            log.error("Error occurred while trying to get the available tenants", e);
+        } catch (DeviceManagementException e) {
+            log.error("Error occurred while trying to get the available tenants from device manager service ", e);
+        }
+    }
+
+    private void executeTask(){
 
         MonitoringManager monitoringManager = PolicyManagementDataHolder.getInstance().getMonitoringManager();
         List<String> deviceTypes = new ArrayList<>();
@@ -121,23 +182,5 @@ public class MonitoringTask implements Task {
         } else {
             log.info("No device types registered currently. So did not run the monitoring task.");
         }
-
-    }
-
-    /**
-     * Check whether Device platform (ex: android) is exist in the cdm-config.xml file before adding a
-     * Monitoring operation to a specific device type.
-     *
-     * @param deviceType available device types.
-     * @return return platform is exist(true) or not (false).
-     */
-
-    private boolean isPlatformExist(String deviceType) {
-        PolicyMonitoringManager policyMonitoringManager = PolicyManagementDataHolder.getInstance()
-                .getDeviceManagementService().getPolicyMonitoringManager(deviceType);
-        if (policyMonitoringManager != null) {
-            return true;
-        }
-        return false;
     }
 }