apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - Add Direct IP Range dialog box - add new field "guest gateway". (merge from 2.2.beta1 branch to master branch)

Browse Source
This commit is contained in:
Jessica Wang 2010-11-23 16:55:36 -08:00
parent 952dec199a
commit 8666fb3fc4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/jsp/pod.jsp
View File

@ -402,6 +402,13 @@
<input class="text" type="text" id="netmask"/> <input class="text" type="text" id="netmask"/>
<div id="netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div> <div id="netmask_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li> </li>
<li>
<label>Guest Gateway:</label>
<input class="text" type="text" id="guestgateway"/>
<div id="guestgateway_errormsg" class="dialog_formcontent_errormsg" style="display:none;" ></div>
</li>
</ol> </ol>
</form> </form>
</div> </div>

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

@ -584,6 +584,7 @@ function initAddPodVLANButton($button) {
// validate values // validate values
var isValid = true; var isValid = true;
isValid &= validateIp("Netmask", $thisDialog.find("#netmask"), $thisDialog.find("#netmask_errormsg")); isValid &= validateIp("Netmask", $thisDialog.find("#netmask"), $thisDialog.find("#netmask_errormsg"));
isValid &= validateIp("Gateway", $thisDialog.find("#guestgateway"), $thisDialog.find("#guestgateway_errormsg"));
isValid &= validateIp("Start IP Range", $thisDialog.find("#startip"), $thisDialog.find("#startip_errormsg")); //required 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 isValid &= validateIp("End IP Range", $thisDialog.find("#endip"), $thisDialog.find("#endip_errormsg"), true); //optional
if (!isValid) if (!isValid)
@ -592,6 +593,7 @@ function initAddPodVLANButton($button) {
$thisDialog.find("#spinning_wheel").show(); $thisDialog.find("#spinning_wheel").show();
var netmask = trim($thisDialog.find("#netmask").val()); var netmask = trim($thisDialog.find("#netmask").val());
var guestgateway = trim($thisDialog.find("#guestgateway").val());
var startip = trim($thisDialog.find("#startip").val()); var startip = trim($thisDialog.find("#startip").val());
var endip = trim($thisDialog.find("#endip").val()); var endip = trim($thisDialog.find("#endip").val());
@ -600,7 +602,7 @@ function initAddPodVLANButton($button) {
array1.push("&zoneid=" + zoneId); array1.push("&zoneid=" + zoneId);
array1.push("&podId=" + podId); array1.push("&podId=" + podId);
array1.push("&forVirtualNetwork=false"); //direct VLAN array1.push("&forVirtualNetwork=false"); //direct VLAN
array1.push("&gateway="+encodeURIComponent(podObj.gateway)); array1.push("&gateway="+encodeURIComponent(guestgateway));
array1.push("&netmask="+encodeURIComponent(netmask)); array1.push("&netmask="+encodeURIComponent(netmask));
array1.push("&startip="+encodeURIComponent(startip)); array1.push("&startip="+encodeURIComponent(startip));
if(endip != null && endip.length > 0) if(endip != null && endip.length > 0)