From b228841872a32a24aec45286d2bf1b98fa4e5d11 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Wed, 8 Aug 2012 16:44:49 -0700
Subject: [PATCH] CS-15885: cloudstack 3.0 UI - autoscale - add UI-side
 validation - at least one condition is required in Scale Up/Down Policy.

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

diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js
index 54a1646ab79..42e5829478d 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 = [];