You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2012/11/16 11:00:32 UTC

[46/50] git commit: CS-15885: cloudstack 3.0 UI - autoscale - add UI-side validation - at least one condition is required in Scale Up/Down Policy.

CS-15885: cloudstack 3.0 UI - autoscale - add UI-side validation - at least one condition is required in Scale Up/Down Policy.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b2288418
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b2288418
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b2288418

Branch: refs/heads/master
Commit: b228841872a32a24aec45286d2bf1b98fa4e5d11
Parents: 3d754ed
Author: Jessica Wang <je...@citrix.com>
Authored: Wed Aug 8 16:44:49 2012 -0700
Committer: Vijay Venkatachalam <vi...@citrix.com>
Committed: Fri Nov 16 10:56:49 2012 +0530

----------------------------------------------------------------------
 ui/scripts/autoscaler.js |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b2288418/ui/scripts/autoscaler.js
----------------------------------------------------------------------
diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js
index 54a1646..42e5829 100644
--- a/ui/scripts/autoscaler.js
+++ b/ui/scripts/autoscaler.js
@@ -799,14 +799,33 @@
           }
         }
 				
+        //Scale Up Policy				
+				if(args.data.scaleUpDuration == null || args.data.scaleUpDuration.length == 0) {
+				  args.response.error("Duration of Scale Up Policy is required.");
+				  return;
+				}
 				if(args.data.scaleUpDuration < args.data.interval) {
 				  args.response.error("Duration of Scale Up Policy can not be less than Polling Interval.");
 				  return;
+				}				
+				if(scaleUpData.length == 0) {
+				  args.response.error("At least one condition is required in Scale Up Policy.");
+				  return;
+				}
+					
+        //Scale Down Policy					
+				if(args.data.scaleDownDuration == null || args.data.scaleDownDuration.length == 0) {
+				  args.response.error("Duration of Scale Down Policy is required.");
+				  return;
 				}
 				if(args.data.scaleDownDuration < args.data.interval) {
 				  args.response.error("Duration of Scale Down Policy can not be less than Polling Interval.");
 				  return;
-				}
+				}				
+				if(scaleDownData.length == 0) {
+				  args.response.error("At least one condition is required in Scale Down Policy.");
+				  return;
+				}		        
         //validation (end) *****
     
         var scaleVmProfileResponse = [];