Updated Branches: refs/heads/master fa377af9b -> 42169a4f3
adding load.balance property to the cartridge pojo in manager Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/be012a05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/be012a05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/be012a05 Branch: refs/heads/master Commit: be012a0586f3397d434d4cd0ec6a378f4910f824 Parents: 0f6abf7 Author: rekathiru <[email protected]> Authored: Tue Feb 11 15:30:25 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 11 15:30:25 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/manager/dto/Cartridge.java | 30 ++++++++++++++++++++ .../rest/endpoint/services/ServiceUtils.java | 2 ++ 2 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/be012a05/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java index 4460a7e..de610c6 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java @@ -36,6 +36,7 @@ public class Cartridge implements Comparable<Cartridge> { private String provider; private String version; private boolean multiTenant; + private boolean isLoadBalancer; private String hostName; //private String policy; //private String policyDescription; @@ -53,6 +54,11 @@ public class Cartridge implements Comparable<Cartridge> { private String[] accessURLs; private PortMapping[] portMappings; + private String defaultAutoscalingPolicy; + + private String defaultDeploymentPolicy; + + public String getDisplayName() { return displayName; } @@ -232,4 +238,28 @@ public class Cartridge implements Comparable<Cartridge> { public void setLbClusterId(String lbClusterId) { this.lbClusterId = lbClusterId; } + + public boolean isLoadBalancer() { + return isLoadBalancer; + } + + public void setLoadBalancer(boolean loadBalancer) { + this.isLoadBalancer = loadBalancer ; + } + + public String getDefaultAutoscalingPolicy() { + return defaultAutoscalingPolicy; + } + + public void setDefaultAutoscalingPolicy(String defaultAutoscalingPolicy) { + this.defaultAutoscalingPolicy = defaultAutoscalingPolicy; + } + + public String getDefaultDeploymentPolicy() { + return defaultDeploymentPolicy; + } + + public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) { + this.defaultDeploymentPolicy = defaultDeploymentPolicy; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/be012a05/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 96204ee..32e9bc3 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 @@ -474,6 +474,8 @@ public class ServiceUtils { cartridge.setVersion(cartridgeInfo.getVersion()); cartridge.setMultiTenant(cartridgeInfo.getMultiTenant()); cartridge.setHostName(cartridgeInfo.getHostName()); + cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy()); + cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy()); //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED); cartridge.setCartridgeAlias("-"); for(Property property: cartridgeInfo.getLbConfig().getProperties().getProperties()) {
