Repository: stratos Updated Branches: refs/heads/master 51e503106 -> 7df77c8de
Fixing the adding cartridge method validation failure Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7df77c8d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7df77c8d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7df77c8d Branch: refs/heads/master Commit: 7df77c8de3d498c0270934b7452a8da0cc1de402 Parents: 51e5031 Author: Gayan Gunarathne <[email protected]> Authored: Sun Jan 25 00:57:18 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Sun Jan 25 01:00:55 2015 +0530 ---------------------------------------------------------------------- .../stratos/rest/endpoint/api/StratosApiV41.java | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7df77c8d/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 250d640..35145f4 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 @@ -142,7 +142,7 @@ public class StratosApiV41 extends AbstractApi { throws RestAPIException { String cartridgeType = cartridgeDefinitionBean.getType(); - CartridgeBean cartridgeBean = StratosApiV41Utils.getCartridge(cartridgeType); + CartridgeBean cartridgeBean = StratosApiV41Utils.getCartridgeForValidate(cartridgeType); if(cartridgeBean != null) { log.warn(String.format("Cartridge already exists: [cartridge-type] %s", cartridgeType)); return Response.status(Response.Status.CONFLICT).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/7df77c8d/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 e0b9e38..5330036 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 @@ -354,6 +354,25 @@ public class StratosApiV41Utils { } } + public static CartridgeBean getCartridgeForValidate(String cartridgeType) throws RestAPIException { + try { + CartridgeInfo cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType); + if (cartridgeInfo == null) { + return null; + } + return convertCartridgeToCartridgeDefinitionBean(cartridgeInfo); + } + catch(CloudControllerServiceCartridgeNotFoundExceptionException e){ + return null; + } + catch (RemoteException e) { + String message = e.getMessage(); + log.error(message, e); + throw new RestAPIException(message, e); + } + + } + private static CartridgeBean convertCartridgeToCartridgeDefinitionBean(CartridgeInfo cartridgeInfo) { CartridgeBean cartridge = new CartridgeBean(); cartridge.setType(cartridgeInfo.getType());
