Updated Branches: refs/heads/master ea65ed7fb -> 1e23b3cf1
fixing LB cartridge Vs other cartridge catergorization Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1e23b3cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1e23b3cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1e23b3cf Branch: refs/heads/master Commit: 1e23b3cf120d693c66bace2be5cfae817b20f938 Parents: ea65ed7 Author: rekathiru <[email protected]> Authored: Wed Feb 12 16:36:34 2014 +0530 Committer: rekathiru <[email protected]> Committed: Wed Feb 12 16:36:34 2014 +0530 ---------------------------------------------------------------------- .../console/configure_stratos.jag | 13 ++++--------- .../console/configure_stratos_wizard.jag | 12 ++++-------- .../console/util/utility.jag | 5 +++++ .../stratos/rest/endpoint/services/ServiceUtils.java | 4 ++-- 4 files changed, 15 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1e23b3cf/components/org.apache.stratos.manager.console/console/configure_stratos.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_stratos.jag b/components/org.apache.stratos.manager.console/console/configure_stratos.jag index 3fae742..c75390b 100644 --- a/components/org.apache.stratos.manager.console/console/configure_stratos.jag +++ b/components/org.apache.stratos.manager.console/console/configure_stratos.jag @@ -30,20 +30,15 @@ if(wizard.step == 1){ step_data = step_data.deploymentPolicy; }else if(wizard.step == 4){ - step_data = utils.consoleAppUtil.getCartridges(); + step_data = utils.consoleAppUtil.getLbCartridges(); step_data = step_data.cartridge; - for(var i=0;i<step_data.length;i++){ - if(step_data[i].cartridgeType != "lb"){ - step_data.splice(i,1); - } - } - }else if(wizard.step == 5){ step_data = utils.consoleAppUtil.getCartridges(); step_data = step_data.cartridge; - for(var i=0;i<step_data.length;i++){ - if(step_data[i].cartridgeType == "lb"){ + for(var i=0;i<step_data.length;i++) { + if(step_data[i].loadBalancer == true ) { step_data.splice(i,1); + i = i - 1; } } }else if(wizard.step == 6){ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1e23b3cf/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag index a612ca3..3a3baf1 100644 --- a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag +++ b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag @@ -23,19 +23,15 @@ if(wizard.step == 1){ step_data = utils.consoleAppUtil.getPolicyDeployment(); step_data = step_data.deploymentPolicy; }else if(wizard.step == 4){ - step_data = utils.consoleAppUtil.getCartridges(); + step_data = utils.consoleAppUtil.getLbCartridges(); step_data = step_data.cartridge; - for(var i=0;i<step_data.length;i++){ - if(step_data[i].cartridgeType != "lb"){ - step_data.splice(i,1); - } - } }else if(wizard.step == 5){ step_data = utils.consoleAppUtil.getCartridges(); step_data = step_data.cartridge; - for(var i=0;i<step_data.length;i++){ - if(step_data[i].cartridgeType == "lb"){ + for(var i=0;i<step_data.length;i++) { + if(step_data[i].loadBalancer == true ) { step_data.splice(i,1); + i = i - 1; } } }else if(wizard.step == 6){ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1e23b3cf/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index 58a4004..1f4abed 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -173,6 +173,11 @@ consoleAppUtil = new function(){ this.getCartridges = function(){ return this.sendReceive("GET","/cartridge/list",{}).data; }; + + this.getLbCartridges = function(){ + return this.sendReceive("GET","/cartridge/lb",{}).data; + }; + this.getCartridgeInfo = function(alias){ return this.sendReceive("GET","/cartridge/info/"+alias,{}).data; }; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1e23b3cf/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 62e36f2..510c366 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -477,8 +477,8 @@ public class ServiceUtils { cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy()); //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED); cartridge.setCartridgeAlias("-"); - if(cartridgeInfo.getLbConfig() != null && cartridgeInfo.getLbConfig().getProperties() != null) { - for(Property property: cartridgeInfo.getLbConfig().getProperties().getProperties()) { + if(cartridgeInfo.getLbConfig() != null && cartridgeInfo.getProperties() != null) { + for(Property property: cartridgeInfo.getProperties()) { if(property.getName().equals("load.balancer")) { cartridge.setLoadBalancer(true); }
