From 7f47f7b04b6d775be68ab7655b4beb7891790c6c Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 28 Jun 2011 18:15:58 -0700
Subject: [PATCH] bug 10340: cloudStack - extend createPortFowardingRule to
 support CIDRList instead of CIDR.

---
 ui/jsp/ipaddress.jsp               | 20 ++++++++++----------
 ui/scripts/cloud.core.ipaddress.js |  5 +++--
 ui/scripts/cloud.core.js           | 25 +++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp
index add23b6ffc6..18959859c11 100644
--- a/ui/jsp/ipaddress.jsp
+++ b/ui/jsp/ipaddress.jsp
@@ -289,9 +289,9 @@ dictionary = {
         <div id="tab_container">
 	        <div class="grid_container" id="grid_container">
 	            <div class="grid_header">
-	                <div class="grid_header_cell" style="width: 10%; ">
+	                <div class="grid_header_cell" style="width: 25%; ">
 	                    <div class="grid_header_title">
-	                        <fmt:message key="label.cidr"/></div>
+	                        <fmt:message key="label.cidr.list"/></div>
 	                </div>		            
 	                <div class="grid_header_cell" style="width: 15%; ">
 	                    <div class="grid_header_title">
@@ -305,11 +305,11 @@ dictionary = {
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.protocol"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 25%;  border: none;">
+	                <div class="grid_header_cell" style="width: 15%;  border: none;">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.instance"/></div>
 	                </div>
-	                <div class="grid_header_cell" style="width: 10%; ">
+	                <div class="grid_header_cell" style="width: 5%; ">
 	                    <div class="grid_header_title">
 	                        <fmt:message key="label.state"/></div>
 	                </div>
@@ -319,7 +319,7 @@ dictionary = {
 	                </div>
 	            </div>
 	            <div class="grid_rows even" id="create_port_forwarding_row">
-	                <div class="grid_row_cell" style="width: 10%; ">  
+	                <div class="grid_row_cell" style="width: 25%; ">  
 	                    <input id="cidr" class="text" type="text" />
 	                    <div id="cidr_errormsg" class="errormsg" style="display: none;">Error msg will appear here</div>
 	                </div>
@@ -345,12 +345,12 @@ dictionary = {
 	                   <select class="select" id="protocol" style="width:70%;">	                    
 	                   </select>
 	                </div>
-	                <div class="grid_row_cell" style="width: 25%; ">                   
+	                <div class="grid_row_cell" style="width: 15%; ">                   
 	                    <select class="select" id="vm">
 	                    </select>
 	                    <div id="vm_errormsg" class="errormsg" style="display: none;"></div>	                    
 	                </div>
-	                <div class="grid_row_cell" style="width: 10%; ">   
+	                <div class="grid_row_cell" style="width: 5%; ">   
 	                    <div class="row_celltitles" id="state" style="padding:1px;"></div>
 	                </div>  
 	                <div class="grid_row_cell" style="width: 10%; ">
@@ -649,7 +649,7 @@ dictionary = {
 <!-- Port Forwarding template (begin) -->
 <div class="grid_rows odd" id="port_forwarding_template" style="display: none">    
     <div id="row_container">
-        <div class="grid_row_cell" style="width: 10%; ">
+        <div class="grid_row_cell" style="width: 25%; ">
             <div class="row_celltitles" id="cidr" style="padding:1px;"></div>
         </div>
         <div class="grid_row_cell" style="width: 15%; ">
@@ -661,10 +661,10 @@ dictionary = {
         <div class="grid_row_cell" style="width: 10%; ">
             <div class="row_celltitles" id="protocol"></div>
         </div>
-        <div class="grid_row_cell" style="width: 25%; ">
+        <div class="grid_row_cell" style="width: 15%; ">
             <div class="row_celltitles" id="vm_name"></div>
         </div>   
-        <div class="grid_row_cell" style="width: 10%; ">
+        <div class="grid_row_cell" style="width: 5%; ">
             <div class="row_celltitles" id="state" style="padding:1px;"></div>
         </div>        
         <div class="grid_row_cell" style="width: 10%; ">
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 5dc874e000c..3969d3495f2 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -280,8 +280,9 @@ function afterLoadIpJSP() {
     */
     
     $createPortForwardingRow.find("#add_link").bind("click", function(event){	        
-		var isValid = true;			
-		isValid &= validateCIDR("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
+		var isValid = true;		
+	
+		isValid &= validateCIDRList("CIDR", $createPortForwardingRow.find("#cidr"), $createPortForwardingRow.find("#cidr_errormsg"), true); //optional		
 				
 		isValid &= validateInteger("Public Port", $createPortForwardingRow.find("#public_port"), $createPortForwardingRow.find("#public_port_errormsg"), 1, 65535, false); //required
 		isValid &= validateInteger("Public End Port", $createPortForwardingRow.find("#public_end_port"), $createPortForwardingRow.find("#public_end_port_errormsg"), 1, 65535, true); //optional
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 9e80ea97dbe..1b3f802b3de 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1893,6 +1893,31 @@ function validateCIDR(label, field, errMsgField, isOptional) {
 	return isValid;
 }
 
+function validateCIDRList(label, field, errMsgField, isOptional) {  	
+    if(validateString(label, field, errMsgField, isOptional) == false)
+        return;        
+    var isValid = true;
+    var errMsg = "";
+    var cidrList = field.val();    
+        
+    var array1 = cidrList.split(",");
+    for(var i=0; i < array1.length; i++) {
+        var value = array1[i];   
+        if(value!=null && value.length>0) {
+            myregexp = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2}$/;	   
+            var isMatch = myregexp.test(value);
+            if(!isMatch) { 
+    	        isValid = false;		
+    	    }
+    	}	
+    }       
+    if(isValid == false)
+    	errMsg = g_dictionary["label.example"] + ": 10.1.1.0/24,10.1.1.1/24,10.1.1.2/24";
+    
+	showError(isValid, field, errMsgField, errMsg);	
+	return isValid;
+}
+
 /*
 function validateFilename(label, field, errMsgField, isOptional) {  
     if(validateString(label, field, errMsgField, isOptional) == false)