mirror of https://github.com/apache/cloudstack.git
bug 7448: zone tree - network - Add (direct) network - remove Type (direct, public) since type is always direct, remove "untagged" option since direct network doesn't have "untagged" option.
This commit is contained in:
Jessica Wang
parent
d7feff5b54
commit
476ed64f6b
|
|
@ -591,15 +591,7 @@
|
|||
</p>
|
||||
<div class="dialog_formcontent">
|
||||
<form action="#" method="post" id="form_acquire">
|
||||
<ol>
|
||||
<li style="display: none" id="add_publicip_vlan_type_container">
|
||||
<label for="add_publicip_vlan_type">
|
||||
Type:</label>
|
||||
<select class="select" name="add_publicip_vlan_type" id="add_publicip_vlan_type">
|
||||
<option value="false">Direct</option>
|
||||
<option value="true">Virtual</option>
|
||||
</select>
|
||||
</li>
|
||||
<ol>
|
||||
<li style="display: none" id="add_publicip_vlan_network_name_container">
|
||||
<label for="user_name">
|
||||
Network Name:</label>
|
||||
|
|
@ -618,9 +610,10 @@
|
|||
<label for="add_publicip_vlan_tagged">
|
||||
VLAN:</label>
|
||||
<select class="select" name="add_publicip_vlan_tagged" id="add_publicip_vlan_tagged">
|
||||
<option value="tagged">tagged</option>
|
||||
</select>
|
||||
</li>
|
||||
<li style="display: none" id="add_publicip_vlan_vlan_container">
|
||||
<li id="add_publicip_vlan_vlan_container">
|
||||
<label for="user_name">
|
||||
VLAN ID:</label>
|
||||
<input class="text" type="text" name="add_publicip_vlan_vlan" id="add_publicip_vlan_vlan" />
|
||||
|
|
|
|||
|
|
@ -543,55 +543,20 @@ function initAddNetworkButton($button) {
|
|||
var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone");
|
||||
|
||||
//***** binding Event Handler (begin) ******
|
||||
//direct VLAN shows only "tagged" option while public VLAN shows both "tagged" and "untagged" option.
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_type").change(function(event) {
|
||||
var addPublicipVlanTagged = $dialogAddNetworkForZone.find("#add_publicip_vlan_tagged").empty();
|
||||
|
||||
if ($(this).val() == "false") { //direct VLAN (only tagged option)
|
||||
addPublicipVlanTagged.append('<option value="tagged">tagged</option>');
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container").show();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_desc_container").show();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan_container").show();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container, #add_publicip_vlan_network_desc_container").show();
|
||||
|
||||
}
|
||||
else if ($(this).val() == "true") { //public VLAN
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_desc_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_cidr_container").hide();
|
||||
addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');
|
||||
}
|
||||
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_tagged").change();
|
||||
|
||||
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
if (zoneObj.networktype == "Advanced") {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_tagged").change(function(event) {
|
||||
if ($(this).val() == "tagged") {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan_container").show();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").hide();
|
||||
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
|
||||
}
|
||||
else if($(this).val() == "untagged") {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").hide();
|
||||
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>');
|
||||
}
|
||||
|
||||
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
|
||||
|
||||
return false;
|
||||
});
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
|
||||
|
||||
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
|
||||
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_tagged").change();
|
||||
// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container".
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
|
||||
|
||||
if (zoneObj.networktype == "Advanced") {
|
||||
|
||||
}
|
||||
else {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_container").hide();
|
||||
|
|
@ -614,15 +579,15 @@ function initAddNetworkButton($button) {
|
|||
$button.unbind("click").bind("click", function(event) {
|
||||
$dialogAddNetworkForZone.find("#info_container").hide();
|
||||
$dialogAddNetworkForZone.find("#zone_name").text(fromdb(zoneObj.name));
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan_container, #add_publicip_vlan_domain_container, #add_publicip_vlan_account_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_tagged, #add_publicip_vlan_vlan, #add_publicip_vlan_gateway, #add_publicip_vlan_netmask, #add_publicip_vlan_startip, #add_publicip_vlan_endip, #add_publicip_vlan_account").val("");
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_domain_container, #add_publicip_vlan_account_container").hide();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan, #add_publicip_vlan_gateway, #add_publicip_vlan_netmask, #add_publicip_vlan_startip, #add_publicip_vlan_endip, #add_publicip_vlan_account").val("");
|
||||
|
||||
if (zoneObj.networktype == 'Basic') {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_type_container").hide();
|
||||
} else {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").show();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_type").change();
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_type_container").show();
|
||||
|
||||
}
|
||||
else {
|
||||
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").show();
|
||||
|
||||
var podSelect = $dialogAddNetworkForZone.find("#add_publicip_vlan_pod").empty();
|
||||
$.ajax({
|
||||
data: createURL("command=listPods&zoneId="+zoneObj.id),
|
||||
|
|
@ -687,26 +652,20 @@ function initAddNetworkButton($button) {
|
|||
|
||||
// validate values
|
||||
var isValid = true;
|
||||
var isTagged = $thisDialog.find("#add_publicip_vlan_tagged").val() == "tagged";
|
||||
var isDirect = $thisDialog.find("#add_publicip_vlan_type").val() == "false";
|
||||
var isTagged = true;
|
||||
var isDirect = true;
|
||||
|
||||
isValid &= validateString("Account", $thisDialog.find("#add_publicip_vlan_account"), $thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
|
||||
|
||||
if (isTagged) {
|
||||
isValid &= validateNumber("VLAN", $thisDialog.find("#add_publicip_vlan_vlan"), $thisDialog.find("#add_publicip_vlan_vlan_errormsg"), 2, 4095);
|
||||
}
|
||||
if (isDirect) {
|
||||
isValid &= validateString("Network Name", $thisDialog.find("#add_publicip_vlan_network_name"), $thisDialog.find("#add_publicip_vlan_network_name_errormsg"));
|
||||
isValid &= validateString("Network Description", $thisDialog.find("#add_publicip_vlan_network_desc"), $thisDialog.find("#add_publicip_vlan_network_desc_errormsg"));
|
||||
}
|
||||
isValid &= validateNumber("VLAN", $thisDialog.find("#add_publicip_vlan_vlan"), $thisDialog.find("#add_publicip_vlan_vlan_errormsg"), 2, 4095);
|
||||
isValid &= validateString("Network Name", $thisDialog.find("#add_publicip_vlan_network_name"), $thisDialog.find("#add_publicip_vlan_network_name_errormsg"));
|
||||
isValid &= validateString("Network Description", $thisDialog.find("#add_publicip_vlan_network_desc"), $thisDialog.find("#add_publicip_vlan_network_desc_errormsg"));
|
||||
isValid &= validateIp("Gateway", $thisDialog.find("#add_publicip_vlan_gateway"), $thisDialog.find("#add_publicip_vlan_gateway_errormsg"));
|
||||
isValid &= validateIp("Netmask", $thisDialog.find("#add_publicip_vlan_netmask"), $thisDialog.find("#add_publicip_vlan_netmask_errormsg"));
|
||||
isValid &= validateIp("Start IP Range", $thisDialog.find("#add_publicip_vlan_startip"), $thisDialog.find("#add_publicip_vlan_startip_errormsg")); //required
|
||||
isValid &= validateIp("End IP Range", $thisDialog.find("#add_publicip_vlan_endip"), $thisDialog.find("#add_publicip_vlan_endip_errormsg"), true); //optional
|
||||
if (!isValid)
|
||||
return;
|
||||
|
||||
//$thisDialog.dialog("close"); //only close dialog when this action succeeds
|
||||
|
||||
$thisDialog.find("#spinning_wheel").show()
|
||||
|
||||
var vlan = trim($thisDialog.find("#add_publicip_vlan_vlan").val());
|
||||
|
|
@ -722,80 +681,50 @@ function initAddNetworkButton($button) {
|
|||
} else if (isDirect) {
|
||||
scopeParams = "&isshared=true";
|
||||
}
|
||||
|
||||
var type = trim($thisDialog.find("#add_publicip_vlan_type").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());
|
||||
var endip = trim($thisDialog.find("#add_publicip_vlan_endip").val());
|
||||
|
||||
if (!isDirect) {
|
||||
// Allocating ip ranges on a vlan for virtual networking
|
||||
$.ajax({
|
||||
data: createURL("command=createVlanIpRange&forVirtualNetwork="+type+"&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();
|
||||
$thisDialog.dialog("close");
|
||||
|
||||
/*
|
||||
var $template1 = $("#vlan_template").clone();
|
||||
$template1.find("#vlan_type_icon").removeClass("direct").addClass("virtual");
|
||||
|
||||
var item = json.createvlaniprangeresponse.vlan;
|
||||
vlanJsonToTemplate(item, $template1, false);
|
||||
$vlanContainer.prepend($template1);
|
||||
$template1.fadeIn("slow");
|
||||
*/
|
||||
},
|
||||
error: function(XMLHttpResponse) {
|
||||
handleError(XMLHttpResponse, function() {
|
||||
handleErrorInDialog(XMLHttpResponse, $thisDialog);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
// Creating network for the direct networking
|
||||
var name = todb($thisDialog.find("#add_publicip_vlan_network_name").val());
|
||||
var desc = todb($thisDialog.find("#add_publicip_vlan_network_desc").val());
|
||||
$.ajax({
|
||||
data: createURL("command=listNetworkOfferings"),
|
||||
dataType: "json",
|
||||
async: false,
|
||||
success: function(json) {
|
||||
var networkOfferings = json.listnetworkofferingsresponse.networkoffering;
|
||||
if (networkOfferings != null && networkOfferings.length > 0) {
|
||||
for (var i = 0; i < networkOfferings.length; i++) {
|
||||
if (networkOfferings[i].type == "Direct" && 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)),
|
||||
dataType: "json",
|
||||
success: function(json) {
|
||||
$thisDialog.find("#spinning_wheel").hide();
|
||||
$thisDialog.dialog("close");
|
||||
|
||||
var item = json.createnetworkresponse.network;
|
||||
var $midmenuItem1 = $("#midmenu_item").clone();
|
||||
$midmenuItem1.data("toRightPanelFn", directNetworkToRightPanel);
|
||||
directNetworkToMidmenu(item, $midmenuItem1);
|
||||
bindClickToMidMenu($midmenuItem1, directNetworkToRightPanel, directNetworkGetMidmenuId);
|
||||
$("#midmenu_container").append($midmenuItem1.show());
|
||||
},
|
||||
error: function(XMLHttpResponse) {
|
||||
handleError(XMLHttpResponse, function() {
|
||||
handleErrorInDialog(XMLHttpResponse, $thisDialog);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Creating network for the direct networking
|
||||
var name = todb($thisDialog.find("#add_publicip_vlan_network_name").val());
|
||||
var desc = todb($thisDialog.find("#add_publicip_vlan_network_desc").val());
|
||||
$.ajax({
|
||||
data: createURL("command=listNetworkOfferings"),
|
||||
dataType: "json",
|
||||
async: false,
|
||||
success: function(json) {
|
||||
var networkOfferings = json.listnetworkofferingsresponse.networkoffering;
|
||||
if (networkOfferings != null && networkOfferings.length > 0) {
|
||||
for (var i = 0; i < networkOfferings.length; i++) {
|
||||
if (networkOfferings[i].type == "Direct" && 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)),
|
||||
dataType: "json",
|
||||
success: function(json) {
|
||||
$thisDialog.find("#spinning_wheel").hide();
|
||||
$thisDialog.dialog("close");
|
||||
|
||||
var item = json.createnetworkresponse.network;
|
||||
var $midmenuItem1 = $("#midmenu_item").clone();
|
||||
$midmenuItem1.data("toRightPanelFn", directNetworkToRightPanel);
|
||||
directNetworkToMidmenu(item, $midmenuItem1);
|
||||
bindClickToMidMenu($midmenuItem1, directNetworkToRightPanel, directNetworkGetMidmenuId);
|
||||
$("#midmenu_container").append($midmenuItem1.show());
|
||||
},
|
||||
error: function(XMLHttpResponse) {
|
||||
handleError(XMLHttpResponse, function() {
|
||||
handleErrorInDialog(XMLHttpResponse, $thisDialog);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
},
|
||||
"Cancel": function() {
|
||||
$(this).dialog("close");
|
||||
|
|
|
|||
Loading…
Reference in New Issue