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

bug 7803: Added ability to specify whether a direct network is default or not.

This commit is contained in:
will 2011-01-11 16:31:00 -08:00
parent 72b4552f01
commit 866fb132fd
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/jsp/network.jsp
View File

@ -326,7 +326,17 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Is Default:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="default">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("vlan")%>:</div>
@ -336,7 +346,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("gateway")%>:</div>
@ -346,7 +356,7 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Netmask:</div>
@ -356,7 +366,7 @@
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Domain:</div>
@ -366,7 +376,7 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Account:</div>
@ -996,6 +1006,14 @@
<input class="text" type="text" name="add_publicip_vlan_network_desc" id="add_publicip_vlan_network_desc" />
<div id="add_publicip_vlan_network_desc_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
</div>
</li>
<li>
<label for="user_name">
Is Default?</label>
<select class="select" name="add_publicip_vlan_default" id="add_publicip_vlan_default">
<option value="false">No</option>
<option value="true">Yes</option>
</select>
</li>
<li id="add_publicip_vlan_container">
<label for="add_publicip_vlan_tagged">

9
ui/scripts/cloud.core.network.js
View File

@ -87,7 +87,7 @@ function networkPopulateMiddleMenu($leftmenuItem1) {
//public network
$midmenuContainer.find("#midmenu_container_no_items_available").remove(); //There is always at least one item (i.e. public network) in middle menu. So, "no items available" shouldn't be in middle menu even there is zero direct network item in middle menu.
$.ajax({
data: createURL("command=listNetworks&isSystem=true&zoneId="+zoneObj.id),
data: createURL("command=listNetworks&trafficType=Public&isSystem=true&zoneId="+zoneObj.id),
dataType: "json",
async: false,
success: function(json) {
@ -883,7 +883,7 @@ function directNetworkJsonToDetailsTab() {
$thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
$thisTab.find("#default").text((jsonObj.isdefault) ? "Yes" : "No");
$thisTab.find("#vlan").text(fromdb(jsonObj.vlan));
$thisTab.find("#gateway").text(fromdb(jsonObj.gateway));
$thisTab.find("#netmask").text(fromdb(jsonObj.netmask));
@ -1105,7 +1105,8 @@ function bindAddNetworkButton($button) {
} else if (isDirect) {
scopeParams = "&isshared=true";
}
var isDefault = trim($thisDialog.find("#add_publicip_vlan_default").val());
var gateway = trim($thisDialog.find("#add_publicip_vlan_gateway").val());
var netmask = trim($thisDialog.find("#add_publicip_vlan_netmask").val());
var startip = trim($thisDialog.find("#add_publicip_vlan_startip").val());
@ -1125,7 +1126,7 @@ function bindAddNetworkButton($button) {
if (networkOfferings[i].isdefault) {
// Create a network from this.
$.ajax({
data: createURL("command=createNetwork&name="+name+"&displayText="+desc+"&networkOfferingId="+networkOfferings[i].id+"&zoneId="+zoneObj.id+vlan+scopeParams+"&gateway="+todb(gateway)+"&netmask="+todb(netmask)+"&startip="+todb(startip)+"&endip="+todb(endip)),
data: createURL("command=createNetwork&isDefault="+isDefault+"&name="+name+"&displayText="+desc+"&networkOfferingId="+networkOfferings[i].id+"&zoneId="+zoneObj.id+vlan+scopeParams+"&gateway="+todb(gateway)+"&netmask="+todb(netmask)+"&startip="+todb(startip)+"&endip="+todb(endip)),
dataType: "json",
success: function(json) {
$thisDialog.find("#spinning_wheel").hide();