stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [10/14] stratos git commit: fix threshold Auto Scaling Policy Definition
Date Mon, 22 Dec 2014 06:29:16 GMT
fix threshold Auto Scaling Policy Definition


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7af19f54
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7af19f54
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7af19f54

Branch: refs/heads/master
Commit: 7af19f54b9f7f394a0c2b019e1aa37b40f6549d4
Parents: da1a610
Author: Dakshika Jayathilaka <sinhaladjs@gmail.com>
Authored: Mon Dec 22 11:28:09 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Mon Dec 22 11:58:58 2014 +0530

----------------------------------------------------------------------
 .../default/configure/autoscalingpolicies.json  |  6 ++---
 .../schema/configure/autoscalingpolicies.json   | 24 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/7af19f54/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 4fed272..f570efd 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
@@ -5,13 +5,13 @@
     "instanceRoundingFactor": 0.2,
     "loadThresholds": {
         "requestsInFlight": {
-            "upperLimit": 30
+            "threshold": 30
         },
         "memoryConsumption": {
-            "upperLimit": 80
+            "threshold": 80
         },
         "loadAverage": {
-            "upperLimit": 100
+            "threshold": 100
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/7af19f54/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 32e79da..f65e758 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
@@ -61,11 +61,11 @@
                         "collapsed": false
                     },
                     "properties":{
-                        "upperLimit": {
+                        "threshold": {
                             "type":"number",
-                            "id": "root/loadThresholds/requestsInFlight/upperLimit",
-                            "title": "Upper Limit",
-                            "name": "Upper Limit",
+                            "id": "root/loadThresholds/requestsInFlight/threshold",
+                            "title": "Threshold",
+                            "name": "Threshold",
                             "default":30,
                             "format": "number",
                             "required":false
@@ -83,11 +83,11 @@
                         "collapsed": false
                     },
                     "properties":{
-                        "upperLimit": {
+                        "threshold": {
                             "type":"number",
-                            "id": "root/loadThresholds/memoryConsumption/upperLimit",
-                            "title": "Upper Limit",
-                            "name": "Upper Limit",
+                            "id": "root/loadThresholds/memoryConsumption/threshold",
+                            "title": "Threshold",
+                            "name": "Threshold",
                             "default":80,
                             "format": "number",
                             "required":false
@@ -105,11 +105,11 @@
                         "collapsed": false
                     },
                     "properties":{
-                        "upperLimit": {
+                        "threshold": {
                             "type":"number",
-                            "id": "root/loadThresholds/loadAverage/upperLimit",
-                            "title": "Upper Limit",
-                            "name": "Upper Limit",
+                            "id": "root/loadThresholds/loadAverage/threshold",
+                            "title": "Threshold",
+                            "name": "Threshold",
                             "default":100,
                             "format": "number",
                             "required":false


Mime
View raw message