Fixing issues in Integration tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d04e3e97 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d04e3e97 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d04e3e97 Branch: refs/heads/tenant-isolation Commit: d04e3e97b223297782b2b65b2120b07356801a9e Parents: f2080dc Author: Dinithi <[email protected]> Authored: Fri Aug 7 17:36:17 2015 +0530 Committer: Dinithi <[email protected]> Committed: Fri Aug 7 17:36:17 2015 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 2 - .../rest/endpoint/api/StratosApiV41Utils.java | 22 +++--- .../tests/SampleApplicationsTest.java | 73 ++++++++++---------- 3 files changed, 45 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d04e3e97/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 0cd124d..a5d761e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -798,7 +798,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { public Cartridge[] getCartridgesByTenant(int tenantId) { Collection<Cartridge> allCartridges = CloudControllerContext.getInstance().getCartridges(); - log.info("---------------------------- All cartridges: "+ allCartridges); List<Cartridge> cartridges = new ArrayList<Cartridge>(); if (allCartridges == null || allCartridges.size() == 0) { log.info("No registered Cartridge found for [tenant-id]" + tenantId); @@ -813,7 +812,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } - log.info("---------------------------- Cartridges for tenant: "+ cartridges); return cartridges.toArray(new Cartridge[cartridges.size()]); } http://git-wip-us.apache.org/repos/asf/stratos/blob/d04e3e97/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 543dd44..d69fab2 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -1026,7 +1026,7 @@ public class StratosApiV41Utils { } List<String> cartridgeTypes = new ArrayList<String>(); - String[] cartridgeUuids = null; + String[] cartridgeUuids; List<String> groupNames; String[] cartridgeGroupNames; @@ -1332,7 +1332,7 @@ public class StratosApiV41Utils { if (log.isDebugEnabled()) { log.debug(String.format("Removing cartridge group: [cartridge-group-name] %s [tenant-id] %d " ,name,tenantId)); } - String serviceGroupUuid = null; + String serviceGroupUuid; // Check whether cartridge group exists try { @@ -1670,11 +1670,7 @@ public class StratosApiV41Utils { // Validate top level group deployment policy with cartridges if (group.getCartridges() != null) { - if (group.getDeploymentPolicy() != null) { - groupParentHasDeploymentPolicy = true; - } else { - groupParentHasDeploymentPolicy = false; - } + groupParentHasDeploymentPolicy = group.getDeploymentPolicy() != null; validateCartridgesForDeploymentPolicy(group.getCartridges(), groupParentHasDeploymentPolicy); } @@ -1740,7 +1736,7 @@ public class StratosApiV41Utils { Collection<CartridgeGroupReferenceBean> groups, boolean hasDeploymentPolicy) throws RestAPIException { - boolean groupHasDeploymentPolicy = false; + boolean groupHasDeploymentPolicy; for (CartridgeGroupReferenceBean group : groups) { if (groupsSet.get(group.getAlias()) != null) { @@ -2007,8 +2003,8 @@ public class StratosApiV41Utils { public static ApplicationInfoBean getApplicationRuntime(String applicationId,int tenantId) throws RestAPIException { ApplicationInfoBean applicationBean = null; - ApplicationContext applicationContext = null; - String applicationUuid=null; + ApplicationContext applicationContext; + String applicationUuid; //Checking whether application is in deployed mode try { applicationUuid=getAutoscalerServiceClient().getApplicationByTenant(applicationId,tenantId).getApplicationUuid(); @@ -2029,13 +2025,13 @@ public class StratosApiV41Utils { try { ApplicationManager.acquireReadLockForApplication(applicationUuid); Application application = ApplicationManager.getApplications().getApplication(applicationUuid); + if (application == null) { + return null; + } if (application.getInstanceContextCount() > 0 || (applicationContext != null && applicationContext.getStatus().equals("Deployed"))) { - if (application == null) { - return null; - } applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application); for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) { addClustersInstancesToApplicationInstanceBean(instanceBean, application); http://git-wip-us.apache.org/repos/asf/stratos/blob/d04e3e97/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java index 3b89161..ecd91fc 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java @@ -442,13 +442,13 @@ public class SampleApplicationsTest extends StratosTestServerManager { assertEquals(deployed, true); //Application active handling - assertApplicationActivation(bean.getApplicationUuid()); + assertApplicationActivation("g-sc-G123-1", -1234); //Group active handling - assertGroupActivation(bean.getApplicationUuid()); + assertGroupActivation("g-sc-G123-1", -1234); //Cluster active handling - assertClusterActivation(bean.getApplicationUuid()); + assertClusterActivation("g-sc-G123-1", -1234); //Updating application /* boolean updated = applicationTest.updateApplication("g-sc-G123-1.json", @@ -481,7 +481,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { restClient); assertEquals(unDeployed, true); - assertApplicationUndeploy(bean.getApplicationUuid()); + assertApplicationUndeploy("g-sc-G123-1", -1234); boolean removed = applicationTest.removeApplication("g-sc-G123-1", endpoint, restClient); @@ -773,7 +773,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { private void runApplicationTest(String applicationFolderName, String applicationId) { executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/deploy.sh"); - assertApplicationActivation(applicationId); + assertApplicationActivation(applicationId, -1234); executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/undeploy.sh"); assertApplicationNotExists(applicationId); } @@ -825,35 +825,35 @@ public class SampleApplicationsTest extends StratosTestServerManager { /** * Assert application activation * - * @param applicationUuid + * @param applicationId */ - private void assertApplicationActivation(String applicationUuid) { + private void assertApplicationActivation(String applicationId, int tenantId) { long startTime = System.currentTimeMillis(); - Application application = ApplicationManager.getApplications().getApplication(applicationUuid); + Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); while (!((application != null) && (application.getStatus() == ApplicationStatus.Active))) { try { Thread.sleep(1000); } catch (InterruptedException ignore) { } - application = ApplicationManager.getApplications().getApplication(applicationUuid); + application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { break; } } - assertNotNull(String.format("Application is not found: [application-id] %s", applicationUuid), application); - assertEquals(String.format("Application status did not change to active: [application-id] %s", applicationUuid), + assertNotNull(String.format("Application is not found: [application-id] %s", application.getId()), application); + assertEquals(String.format("Application status did not change to active: [application-id] %s", application.getId()), ApplicationStatus.Active, application.getStatus()); } /** * Assert application activation * - * @param applicationUuid + * @param applicationId */ - private void assertGroupActivation(String applicationUuid) { - Application application = ApplicationManager.getApplications().getApplication(applicationUuid); + private void assertGroupActivation(String applicationId, int tenantId) { + Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); assertNotNull(String.format("Application is not found: [application-id] %s", - applicationUuid), application); + applicationId), application); Collection<Group> groups = application.getAllGroupsRecursively(); for(Group group : groups) { @@ -864,12 +864,12 @@ public class SampleApplicationsTest extends StratosTestServerManager { /** * Assert application activation * - * @param applicationUuid + * @param applicationId */ - private void assertClusterActivation(String applicationUuid) { - Application application = ApplicationManager.getApplications().getApplication(applicationUuid); + private void assertClusterActivation(String applicationId, int tenantId) { + Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); assertNotNull(String.format("Application is not found: [application-id] %s", - applicationUuid), application); + applicationId), application); Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively(); for(ClusterDataHolder clusterDataHolder : clusterDataHolderSet) { @@ -877,11 +877,11 @@ public class SampleApplicationsTest extends StratosTestServerManager { String clusterId = clusterDataHolder.getClusterId(); Service service = TopologyManager.getTopology().getService(serviceUuid); assertNotNull(String.format("Service is not found: [application-id] %s [service] %s", - applicationUuid, serviceUuid), service); + applicationId, serviceUuid), service); Cluster cluster = service.getCluster(clusterId); assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s", - applicationUuid, serviceUuid, clusterId), cluster); + applicationId, serviceUuid, clusterId), cluster); boolean clusterActive = false; for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) { @@ -911,16 +911,16 @@ public class SampleApplicationsTest extends StratosTestServerManager { /** * Assert application activation * - * @param applicationUuid + * @param applicationId */ - private void assertApplicationUndeploy(String applicationUuid) { + private void assertApplicationUndeploy(String applicationId, int tenantId) { long startTime = System.currentTimeMillis(); - Application application = ApplicationManager.getApplications().getApplication(applicationUuid); + Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); ApplicationContext applicationContext = null; try { - applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationUuid); + applicationContext = AutoscalerServiceClient.getInstance().getApplicationByTenant(applicationId, tenantId); } catch (RemoteException e) { - log.error("Error while getting the application context for [application] " + applicationUuid); + log.error("Error while getting the application context for [application] " + applicationId); } while (((application != null) && application.getInstanceContextCount() > 0) || (applicationContext == null || applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING))) { @@ -928,41 +928,40 @@ public class SampleApplicationsTest extends StratosTestServerManager { Thread.sleep(1000); } catch (InterruptedException ignore) { } - application = ApplicationManager.getApplications().getApplication(applicationUuid); + application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); try { - applicationContext = AutoscalerServiceClient.getInstance().getApplication(applicationUuid); + applicationContext = AutoscalerServiceClient.getInstance().getApplicationByTenant(applicationId, tenantId); } catch (RemoteException e) { - log.error("Error while getting the application context for [application] " + applicationUuid); + log.error("Error while getting the application context for [application] " + applicationId); } if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { break; } } - assertNotNull(String.format("Application is not found: [application-id] %s", - applicationUuid), application); - assertNotNull(String.format("Application Context is not found: [application-id] %s", - applicationUuid), applicationContext); + assertNotNull(String.format("Application is not found: [application-id] %s", applicationId), application); + assertNotNull(String.format("Application Context is not found: [application-id] %s", applicationId), + applicationContext); //Force undeployment after the graceful deployment if (application.getInstanceContextCount() > 0 || applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) { - log.info("Force undeployment is going to start for the [application] " + applicationUuid); + log.info("Force undeployment is going to start for the [application] " + applicationId); - applicationTest.forceUndeployApplication(applicationUuid, endpoint, restClient); + applicationTest.forceUndeployApplication(applicationId, endpoint, restClient); while (application.getInstanceContextCount() > 0 || applicationContext.getStatus().equals(APPLICATION_STATUS_UNDEPLOYING)) { try { Thread.sleep(1000); } catch (InterruptedException ignore) { } - application = ApplicationManager.getApplications().getApplication(applicationUuid); + application = ApplicationManager.getApplications().getApplicationByTenant(applicationId, tenantId); if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { break; } } } - assertEquals(String.format("Application status did not change to Created: [application-id] %s", applicationUuid), + assertEquals(String.format("Application status did not change to Created: [application-id] %s", applicationId), APPLICATION_STATUS_CREATED, applicationContext.getStatus()); }
