From dde63dce901dad1ce6c8b5c7fb5fdc22ce4b5a52 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 22 Aug 2011 13:30:07 -0700
Subject: [PATCH] bug 11202: cloudStack - Create Service Offering dialog - add
 Network Rate field.

---
 ui/jsp/serviceoffering.jsp               | 17 +++++++++++------
 ui/scripts/cloud.core.serviceoffering.js |  8 +++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 96e4e714322..464fc77e21a 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -221,12 +221,12 @@ dictionary = {
 		<form action="#" method="post" id="form_acquire">
 			<ol>
 				<li>
-					<label for="user_name"><fmt:message key="label.name"/>:</label>
+					<label><fmt:message key="label.name"/>:</label>
 					<input class="text" type="text" name="add_service_name" id="add_service_name"/>
 					<div id="add_service_name_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name"><fmt:message key="label.display.text"/>:</label>
+					<label><fmt:message key="label.display.text"/>:</label>
 					<input class="text" type="text" name="add_service_display" id="add_service_display"/>
 					<div id="add_service_display_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
@@ -238,20 +238,25 @@ dictionary = {
 					</select>
 				</li>		
 				<li>
-					<label for="user_name"><fmt:message key="label.num.cpu.cores"/>:</label>
+					<label><fmt:message key="label.num.cpu.cores"/>:</label>
 					<input class="text" type="text" name="add_service_cpucore" id="add_service_cpucore"/>
 					<div id="add_service_cpucore_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name"><fmt:message key="label.cpu.mhz"/>:</label>
+					<label><fmt:message key="label.cpu.mhz"/>:</label>
 					<input class="text" type="text" name="add_service_cpu" id="add_service_cpu"/>
 					<div id="add_service_cpu_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
 				</li>
 				<li>
-					<label for="user_name"><fmt:message key="label.memory.mb"/>:</label>
+					<label><fmt:message key="label.memory.mb"/>:</label>
 					<input class="text" type="text" name="add_service_memory" id="add_service_memory"/>
 					<div id="add_service_memory_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
-				</li>				
+				</li>					
+				<li>
+					<label><fmt:message key="network.rate"/>:</label>
+					<input class="text" type="text" id="network_rate"/>
+					<div id="network_rate_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
+				</li>	
 				<li id="add_service_offerha_container">
 					<label><fmt:message key="label.offer.ha"/>:</label>
 					<select class="select" id="add_service_offerha">						
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 52767a68611..d02cba6254d 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -82,6 +82,7 @@ function initAddServiceOfferingDialog() {
 		$dialogAddService.find("#add_service_cpucore").val("");
 		$dialogAddService.find("#add_service_cpu").val("");
 		$dialogAddService.find("#add_service_memory").val("");
+		$dialogAddService.find("#network_rate").val("");
 		$dialogAddService.find("#add_service_offerha").val("false");
 			
 		$dialogAddService
@@ -96,10 +97,11 @@ function initAddServiceOfferingDialog() {
 				isValid &= validateInteger("# of CPU Core", $thisDialog.find("#add_service_cpucore"), $thisDialog.find("#add_service_cpucore_errormsg"), 1, 1000);		
 				isValid &= validateInteger("CPU", $thisDialog.find("#add_service_cpu"), $thisDialog.find("#add_service_cpu_errormsg"), 100, 100000);		
 				isValid &= validateInteger("Memory", $thisDialog.find("#add_service_memory"), $thisDialog.find("#add_service_memory_errormsg"), 64, 1000000);	
+				isValid &= validateInteger("Network Rate", $thisDialog.find("#network_rate"), $thisDialog.find("#network_rate_errormsg"), null, null, true); //optional	
 				isValid &= validateString("Tags", $thisDialog.find("#add_service_tags"), $thisDialog.find("#add_service_tags_errormsg"), true);	//optional							
 				
 				if($thisDialog.find("#domain_container").css("display") != "none") {
-				    isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false);                             //required	
+				    isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required	
 				    var domainName = $thisDialog.find("#domain").val();
 				    var domainId;
 				    if(domainName != null && domainName.length > 0) { 				    
@@ -143,6 +145,10 @@ function initAddServiceOfferingDialog() {
 				var memory = $thisDialog.find("#add_service_memory").val();
 				array1.push("&memory="+memory);	
 					
+				var networkRate = $thisDialog.find("#network_rate").val();
+				if(networkRate != null && networkRate.length > 0)
+				    array1.push("&networkrate="+networkRate);									
+				
 				var offerha = $thisDialog.find("#add_service_offerha").val();	
 				array1.push("&offerha="+offerha);