Repository: stratos Updated Branches: refs/heads/tenant-isolation f6261851d -> 2ec7a5ff5
Update the update deployement Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2ec7a5ff Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2ec7a5ff Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2ec7a5ff Branch: refs/heads/tenant-isolation Commit: 2ec7a5ff5af2bd1009c42a614088e02c3d743fd2 Parents: f626185 Author: Gayan Gunarathne <[email protected]> Authored: Thu Jul 9 17:56:22 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Thu Jul 9 17:56:22 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/rest/endpoint/api/StratosApiV41.java | 3 +++ .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2ec7a5ff/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 1fe596f..b973d8e 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 @@ -329,6 +329,9 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/admin/stratos/cartridges/manage") public Response updateCartridge( CartridgeBean cartridgeDefinitionBean) throws RestAPIException { + + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + cartridgeDefinitionBean.setTenantId(carbonContext.getTenantId()); StratosApiV41Utils.updateCartridge(cartridgeDefinitionBean); URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.getType()).build(); return Response.ok(url) http://git-wip-us.apache.org/repos/asf/stratos/blob/2ec7a5ff/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 09a887c..3667518 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 @@ -178,7 +178,6 @@ public class StratosApiV41Utils { * @throws RestAPIException */ public static void updateCartridge(CartridgeBean cartridgeBean) throws RestAPIException { - try { if (log.isDebugEnabled()) { log.debug(String.format("Updating cartridge: [cartridge-type] %s ", cartridgeBean.getType())); @@ -192,7 +191,10 @@ public class StratosApiV41Utils { Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean); CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); - cloudControllerServiceClient.updateCartridge(cartridgeConfig); + cartridgeConfig.setUuid(cloudControllerServiceClient.getCartridgeByTenant(cartridgeBean.getType(), + cartridgeBean.getTenantId()).getUuid()); + + cloudControllerServiceClient.updateCartridge(cartridgeConfig); if (log.isDebugEnabled()) { log.debug(String.format("Successfully updated cartridge: [cartridge-type] %s ", @@ -214,6 +216,10 @@ public class StratosApiV41Utils { String msg = "Could not add cartridge"; log.error(msg, e); throw new RestAPIException(msg); + } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) { + String msg = "Could not find existing cartridge"; + log.error(msg, e); + e.printStackTrace(); } }
