etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7038: Pod page - Add Direct IP Range dialog - remove gateway field. Get gateway value from pod.

This commit is contained in:
Jessica Wang 2010-11-17 14:18:39 -08:00
parent 2184dd1af2
commit d491490cde
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/jsp/pod.jsp
View File

@ -387,24 +387,19 @@
<p>Please enter the following info to add a new direct IP range on untagged VLAN to pod: <b><span id="pod_name_label"></span></b></p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form5">
<ol>
<ol>
<li>
<label for="gateway">Gateway:</label>
<input class="text" type="text" id="gateway"/>
<div id="gateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label for="netmask">Netmask:</label>
<input class="text" type="text" id="netmask"/>
<div id="netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label>IP Range:</label>
<label>Guest IP Range:</label>
<input class="text" style="width:67px" type="text" id="startip"/><span>-</span>
<input class="text" style="width:67px" type="text" id="endip"/>
<div id="startip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
<div id="endip_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
<li>
<label for="netmask">Guest Netmask:</label>
<input class="text" type="text" id="netmask"/>
<div id="netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
</ol>
</form>
</div>

12
ui/scripts/cloud.core.pod.js
View File

@ -565,17 +565,15 @@ function initAddPodVLANButton($button) {
var $thisDialog = $(this);
// validate values
var isValid = true;
isValid &= validateIp("Gateway", $thisDialog.find("#gateway"), $thisDialog.find("#gateway_errormsg"));
var isValid = true;
isValid &= validateIp("Netmask", $thisDialog.find("#netmask"), $thisDialog.find("#netmask_errormsg"));
isValid &= validateIp("Start IP Range", $thisDialog.find("#startip"), $thisDialog.find("#startip_errormsg")); //required
isValid &= validateIp("End IP Range", $thisDialog.find("#endip"), $thisDialog.find("#endip_errormsg"), true); //optional
if (!isValid)
return;
$thisDialog.find("#spinning_wheel").show();
var gateway = trim($thisDialog.find("#gateway").val());
$thisDialog.find("#spinning_wheel").show();
var netmask = trim($thisDialog.find("#netmask").val());
var startip = trim($thisDialog.find("#startip").val());
var endip = trim($thisDialog.find("#endip").val());
@ -584,8 +582,8 @@ function initAddPodVLANButton($button) {
array1.push("&vlan=untagged");
array1.push("&zoneid=" + zoneId);
array1.push("&podId=" + podId);
array1.push("&forVirtualNetwork=false"); //direct VLAN
array1.push("&gateway="+encodeURIComponent(gateway));
array1.push("&forVirtualNetwork=false"); //direct VLAN
array1.push("&gateway="+encodeURIComponent(podObj.gateway));
array1.push("&netmask="+encodeURIComponent(netmask));
array1.push("&startip="+encodeURIComponent(startip));
if(endip != null && endip.length > 0)