Repository: stratos Updated Branches: refs/heads/tenant-isolation 26cedf68f -> e6eb0ec1d
Update application sign up with uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e6eb0ec1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e6eb0ec1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e6eb0ec1 Branch: refs/heads/tenant-isolation Commit: e6eb0ec1d66acc92e44b97293b8aaf98a36e48e1 Parents: 26cedf6 Author: Gayan Gunarathne <[email protected]> Authored: Mon Aug 3 11:08:08 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Mon Aug 3 11:08:08 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41Utils.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e6eb0ec1/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 48972e6..d285991 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 @@ -2665,15 +2665,17 @@ public class StratosApiV41Utils { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); if (domainMappingsBean.getDomainMappings() != null) { StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance(); - - for (DomainMappingBean domainMappingBean : domainMappingsBean.getDomainMappings()) { + String applicationUuid = + AutoscalerServiceClient.getInstance().getApplicationByTenant(applicationId, tenantId) + .getApplicationUuid(); + for (DomainMappingBean domainMappingBean : domainMappingsBean.getDomainMappings()) { ClusterDataHolder clusterDataHolder = findClusterDataHolder( - applicationId, + applicationUuid, domainMappingBean.getCartridgeAlias()); DomainMapping domainMapping = ObjectConverter.convertDomainMappingBeanToStubDomainMapping( domainMappingBean); - domainMapping.setApplicationId(applicationId); + domainMapping.setApplicationId(applicationUuid); domainMapping.setTenantId(tenantId); domainMapping.setServiceName(clusterDataHolder.getServiceType()); domainMapping.setClusterId(clusterDataHolder.getClusterId()); @@ -2701,7 +2703,8 @@ public class StratosApiV41Utils { * @return ClusterDataHolder */ private static ClusterDataHolder findClusterDataHolder(String applicationId, String cartridgeAlias) { - Application application = ApplicationManager.getApplications().getApplication(applicationId); + int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + Application application = ApplicationManager.getApplications().getApplicationByTenant(applicationId,tenantId); if (application == null) { throw new RuntimeException(String.format("Application not found: [application-id] %s", applicationId)); } @@ -2726,9 +2729,13 @@ public class StratosApiV41Utils { try { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + String applicationUuid = + AutoscalerServiceClient.getInstance().getApplicationByTenant(applicationId, tenantId) + .getApplicationUuid(); StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance(); + if (domainName != null) { - serviceClient.removeDomainMapping(applicationId, tenantId, domainName); + serviceClient.removeDomainMapping(applicationUuid, tenantId, domainName); if (log.isInfoEnabled()) { log.info(String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " +
