Update cartridge group with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4642ea9c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4642ea9c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4642ea9c Branch: refs/heads/tenant-isolation Commit: 4642ea9c8f21c69d4cb51ed6e9fc4002b7a61ad7 Parents: c990b8d Author: Gayan Gunarathne <[email protected]> Authored: Wed Jul 15 15:24:37 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Jul 15 15:24:37 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/services/AutoscalerService.java | 2 +- .../services/impl/AutoscalerServiceImpl.java | 4 +- .../common/client/AutoscalerServiceClient.java | 4 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../src/main/resources/AutoscalerService.wsdl | 705 ++++++++++--------- 5 files changed, 360 insertions(+), 359 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4642ea9c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java index 125084e..352b5db 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java @@ -129,7 +129,7 @@ public interface AutoscalerService { * @param applicationId * @return whether application exists or not */ - boolean existApplication(String applicationId); + boolean existApplication(String applicationId,int tenantId); /** * Get all applications http://git-wip-us.apache.org/repos/asf/stratos/blob/4642ea9c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index 82723a9..bdd23e2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -303,8 +303,8 @@ public class AutoscalerServiceImpl implements AutoscalerService { } @Override - public boolean existApplication(String applicationId) { - return AutoscalerContext.getInstance().getApplicationContext(applicationId) != null; + public boolean existApplication(String applicationId,int tenantId) { + return AutoscalerContext.getInstance().getApplicationContextByTenant(applicationId,tenantId) != null; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/4642ea9c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java index 01c779b..474d392 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java @@ -117,8 +117,8 @@ public class AutoscalerServiceClient { return stub.getApplicationByTenant(applicationId, tenantId); } - public boolean existApplication(String applicationId) throws RemoteException { - return stub.existApplication(applicationId); + public boolean existApplication(String applicationId,int tenantId) throws RemoteException { + return stub.existApplication(applicationId,tenantId); } public ApplicationContext[] getApplications() throws RemoteException { http://git-wip-us.apache.org/repos/asf/stratos/blob/4642ea9c/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 b1bcfd1..af39f7a 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 @@ -1442,8 +1442,8 @@ public class StratosApiV41Utils { } // check if an application with same id already exists try { - if (AutoscalerServiceClient.getInstance().existApplication(appDefinition.getApplicationUuid())) { - String msg = "Application already exists: [application-id] " + appDefinition.getApplicationUuid(); + if (AutoscalerServiceClient.getInstance().existApplication(appDefinition.getApplicationId(),appDefinition.getTenantId())) { + String msg = "Application already exists: [application-uuid] " + appDefinition.getApplicationUuid(); throw new RestAPIException(msg); } } catch (RemoteException e) {
