Repository: stratos Updated Branches: refs/heads/tenant-isolation b553f49d0 -> 647771b44
Update the application undeploy flow with uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2678f0fa Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2678f0fa Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2678f0fa Branch: refs/heads/tenant-isolation Commit: 2678f0fa75a6e8143a09f2dcd3085aa81ec4ee1f Parents: b553f49 Author: Gayan Gunarathne <[email protected]> Authored: Sun Jul 12 18:37:53 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Sun Jul 12 18:37:53 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/util/AutoscalerUtil.java | 2 +- .../services/impl/InstanceTerminator.java | 17 +++++++++++++++-- .../stratos/rest/endpoint/api/StratosApiV41.java | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 7 ++++--- .../endpoint/util/converter/ObjectConverter.java | 2 +- .../integration/tests/SampleApplicationsTest.java | 6 +++--- 6 files changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2678f0fa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 2466b5a..b9d5eb9 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -403,7 +403,7 @@ public class AutoscalerUtil { for (NetworkPartitionRef networkPartition : deploymentPolicy.getNetworkPartitionRefs()) { if (networkPartition != null) { if (!networkPartitionIds.contains(networkPartition.getUuid())) { - networkPartitionIds.add(networkPartition.getUuid()); + networkPartitionIds.add(networkPartition.getId()); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2678f0fa/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java index 18f0741..a60aeb3 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java @@ -26,7 +26,10 @@ import org.apache.stratos.cloud.controller.domain.IaasProvider; import org.apache.stratos.cloud.controller.domain.MemberContext; import org.apache.stratos.cloud.controller.exception.CloudControllerException; import org.apache.stratos.cloud.controller.iaases.Iaas; +import org.apache.stratos.cloud.controller.stub.CloudControllerServiceCartridgeNotFoundExceptionException; +import org.apache.stratos.common.client.CloudControllerServiceClient; +import java.rmi.RemoteException; import java.util.concurrent.locks.Lock; /** @@ -41,8 +44,18 @@ public class InstanceTerminator implements Runnable { public InstanceTerminator(MemberContext memberContext) { String provider = memberContext.getPartition().getProvider(); - IaasProvider iaasProvider = CloudControllerContext.getInstance() - .getIaasProvider(memberContext.getCartridgeType(), provider); + String type=null; + try { + type= + CloudControllerServiceClient.getInstance().getCartridge(memberContext.getCartridgeType()).getType(); + } catch (RemoteException e) { + log.error("Error in retrieving the cartridge",e); + } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) { + log.error("Error in retrieving the cartridge", e); + } + IaasProvider iaasProvider = CloudControllerContext.getInstance() + .getIaasProvider(type, provider); + this.iaas = iaasProvider.getIaas(); this.memberContext = memberContext; } http://git-wip-us.apache.org/repos/asf/stratos/blob/2678f0fa/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index bfb304a..747d9bd 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -1304,7 +1304,7 @@ public class StratosApiV41 extends AbstractApi { return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, message)).build(); } - StratosApiV41Utils.undeployApplication(applicationId, force); + StratosApiV41Utils.undeployApplication(applicationDefinition.getApplicationUuid(), force); return Response.accepted().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Application undeploy process started successfully: [application-id] %s", applicationId))).build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2678f0fa/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 2728778..df816f3 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 @@ -1873,12 +1873,13 @@ public class StratosApiV41Utils { log.info(String.format("Starting to remove application [application-id %s", applicationId)); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); AutoscalerServiceClient asServiceClient = getAutoscalerServiceClient(); - ApplicationContext asApplication = asServiceClient.getApplication(applicationId); + ApplicationContext asApplication = asServiceClient.getApplicationByTenant(applicationId,carbonContext.getTenantId()); ApplicationBean application = ObjectConverter.convertStubApplicationContextToApplicationDefinition( asApplication); - asServiceClient.deleteApplication(applicationId); + asServiceClient.deleteApplication(application.getApplicationUuid()); List<String> usedCartridges = new ArrayList<String>(); List<String> usedCartridgeGroups = new ArrayList<String>(); @@ -2834,7 +2835,7 @@ public class StratosApiV41Utils { for (ApplicationContext applicationContext : applicationContexts) { if (applicationContext != null) { String[] networkPartitions = AutoscalerServiceClient.getInstance(). - getApplicationNetworkPartitions(applicationContext.getApplicationId()); + getApplicationNetworkPartitions(applicationContext.getApplicationUuid()); if (networkPartitions != null) { for (int i = 0; i < networkPartitions.length; i++) { if (networkPartitions[i].equals(networkPartitionId)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2678f0fa/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 99dd60b..a291d61 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1161,7 +1161,7 @@ public class ObjectConverter { applicationDefinition.setName(applicationContext.getName()); applicationDefinition.setDescription(applicationContext.getDescription()); applicationDefinition.setStatus(applicationContext.getStatus()); - + applicationDefinition.setApplicationUuid(applicationContext.getApplicationUuid()); // convert and set components if (applicationContext.getComponents() != null) { applicationDefinition.setComponents(new ComponentBean()); http://git-wip-us.apache.org/repos/asf/stratos/blob/2678f0fa/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 5bac1b9..613a1de 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 @@ -73,8 +73,8 @@ public class SampleApplicationsTest extends StratosTestServerManager { private void runApplicationTest(String applicationFolderName, String applicationId) { executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/deploy.sh"); assertApplicationActivation(applicationId); - // executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/undeploy.sh"); - // assertApplicationNotExists(applicationId); + executeCommand(getApplicationsPath() + "/" + applicationFolderName + "/scripts/mock/undeploy.sh"); + assertApplicationNotExists(applicationId); } @@ -133,7 +133,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { } private void assertApplicationNotExists(String applicationName) { - Application application = ApplicationManager.getApplications().getApplication(applicationName); + Application application = ApplicationManager.getApplications().getApplicationByTenent(applicationName); assertNull(String.format("Application is found in the topology : [application-id] %s", applicationName), application); }
