Adding instanceRoundingFactor to autoscaling policy
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5d5a9442 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5d5a9442 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5d5a9442 Branch: refs/heads/master Commit: 5d5a944218d11e6ee1c31b53adbed4c3aeaa6a9e Parents: 8a610a6 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Nov 25 21:58:20 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Nov 25 21:58:20 2014 +0530 ---------------------------------------------------------------------- .../policy/model/AutoscalePolicy.java | 10 +- .../policy/autoscale/AutoscalePolicy.java | 12 +- .../default/configure/autoscalingpolicies.json | 1 + .../schema/configure/autoscalingpolicies.json | 8 + .../policy/autoscale/AutoscalePolicy.java | 10 + .../bean/util/converter/PojoConverter.java | 2 + .../src/main/resources/AutoScalerService.wsdl | 727 ++++++++++--------- 7 files changed, 405 insertions(+), 365 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5d5a9442/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java index e1630b8..a5cc5f3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java @@ -33,6 +33,7 @@ public class AutoscalePolicy implements Serializable { private String description; private boolean isPublic; private int tenantId; + private float instanceRoundingFactor; /** * Gets the value of the loadThresholds property. @@ -175,5 +176,12 @@ public class AutoscalePolicy implements Serializable { return "ASPolicy [id=" + id + ", displayName=" + displayName + ", description=" + description + ", isPublic=" + isPublic + "]"; } - + + public float getInstanceRoundingFactor() { + return instanceRoundingFactor; + } + + public void setInstanceRoundingFactor(float instanceRoundingFactor) { + this.instanceRoundingFactor = instanceRoundingFactor; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/5d5a9442/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java index 919d3b6..254e996 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/autoscaler/policy/autoscale/AutoscalePolicy.java @@ -29,7 +29,9 @@ public class AutoscalePolicy { private boolean isPublic; private LoadThresholds loadThresholds; - + + private float instanceRoundingFactor; + public String getId() { return id; } @@ -69,4 +71,12 @@ public class AutoscalePolicy { public void setIsPublic(boolean isPublic) { this.isPublic = isPublic; } + + public float getInstanceRoundingFactor() { + return instanceRoundingFactor; + } + + public void setInstanceRoundingFactor(float instanceRoundingFactor) { + this.instanceRoundingFactor = instanceRoundingFactor; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/5d5a9442/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json index d5aa54a..b6e42ac 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscalingpolicies.json @@ -2,6 +2,7 @@ "id": "economy", "description":"autoscale policy description", "isPublic":false, + "instanceRoundingFactor": 0.2, "loadThresholds": { "requestsInFlight": { "upperLimit": 30, http://git-wip-us.apache.org/repos/asf/stratos/blob/5d5a9442/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json index 5ae876c..e3c8f56 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json @@ -33,6 +33,14 @@ "default": false, "maxItems":1 }, + "instanceRoundingFactor": { + "type":"number", + "id": "root/instanceRoundingFactor", + "title": "Instance Rounding Factor", + "name": "Instance Rounding Factor", + "default": false, + "maxItems":1 + }, "loadThresholds": { "type":"object", "title":"Load Thresholds", http://git-wip-us.apache.org/repos/asf/stratos/blob/5d5a9442/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java index 5f7e371..b273aee 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java @@ -34,6 +34,8 @@ public class AutoscalePolicy { private boolean isPublic; + private float instanceRoundingFactor; + public String getId() { return id; } @@ -74,4 +76,12 @@ public class AutoscalePolicy { public void setLoadThresholds(LoadThresholds loadThresholds) { this.loadThresholds = loadThresholds; } + + public float getInstanceRoundingFactor() { + return instanceRoundingFactor; + } + + public void setInstanceRoundingFactor(float instanceRoundingFactor) { + this.instanceRoundingFactor = instanceRoundingFactor; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/5d5a9442/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index bbdcae4..bdf746e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -336,6 +336,7 @@ public class PojoConverter { autoscalePolicy.setDescription(autoscalePolicyBean.getDescription()); autoscalePolicy.setIsPublic(autoscalePolicyBean.getIsPublic()); autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName()); + autoscalePolicy.setInstanceRoundingFactor(autoscalePolicyBean.getInstanceRoundingFactor()); if (autoscalePolicyBean.getLoadThresholds() != null) { @@ -603,6 +604,7 @@ public class PojoConverter { autoscalePolicyBean.setIsPublic(autoscalePolicy.getIsPublic()); autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName()); autoscalePolicyBean.setDescription(autoscalePolicy.getDescription()); + autoscalePolicyBean.setInstanceRoundingFactor(autoscalePolicy.getInstanceRoundingFactor()); if (autoscalePolicy.getLoadThresholds() != null) { autoscalePolicyBean.setLoadThresholds(populateLoadThresholds(autoscalePolicy.getLoadThresholds())); }
