diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index d93b0b6fd8f..cb607b2d41a 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -15,85 +15,85 @@
* along with this program. If not, see .
*
*/
-
-function networkGetSearchParams() {
- var moreCriteria = [];
-
- var searchInput = $("#basic_search").find("#search_input").val();
- if (searchInput != null && searchInput.length > 0) {
- moreCriteria.push("&keyword="+todb(searchInput));
- }
-
- var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
- if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
- if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
- && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
- var domainName = $advancedSearchPopup.find("#domain").val();
- if (domainName != null && domainName.length > 0) {
- var domainId;
- if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
- for(var i=0; i < autoCompleteDomains.length; i++) {
- if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
- domainId = autoCompleteDomains[i].id;
- break;
- }
- }
- }
- if(domainId == null) {
- showError(false, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
- }
- else { //e.g. domainId == 5 (number)
- showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
- moreCriteria.push("&domainid="+todb(domainId));
- }
- }
- }
-
- if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none"
- && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {
- var account = $advancedSearchPopup.find("#adv_search_account").val();
- if (account!=null && account.length > 0)
- moreCriteria.push("&account="+account);
- }
- }
-
- return moreCriteria.join("");
-}
-
-var zoneObj;
+
+function networkGetSearchParams() {
+ var moreCriteria = [];
+
+ var searchInput = $("#basic_search").find("#search_input").val();
+ if (searchInput != null && searchInput.length > 0) {
+ moreCriteria.push("&keyword="+todb(searchInput));
+ }
+
+ var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
+ if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
+ if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none"
+ && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) {
+ var domainName = $advancedSearchPopup.find("#domain").val();
+ if (domainName != null && domainName.length > 0) {
+ var domainId;
+ if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
+ for(var i=0; i < autoCompleteDomains.length; i++) {
+ if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
+ domainId = autoCompleteDomains[i].id;
+ break;
+ }
+ }
+ }
+ if(domainId == null) {
+ showError(false, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+ }
+ else { //e.g. domainId == 5 (number)
+ showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
+ moreCriteria.push("&domainid="+todb(domainId));
+ }
+ }
+ }
+
+ if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none"
+ && $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {
+ var account = $advancedSearchPopup.find("#adv_search_account").val();
+ if (account!=null && account.length > 0)
+ moreCriteria.push("&account="+account);
+ }
+ }
+
+ return moreCriteria.join("");
+}
+
+var zoneObj;
function afterLoadNetworkJSP($leftmenuItem1) {
var $topButtonContainer = clearButtonsOnTop();
$("#top_buttons").appendTo($("#top_button_container").empty());
- //switch between different tabs - Public Network page
- var $publicNetworkPage = $("#public_network_page");
- var tabArray = [$publicNetworkPage.find("#tab_details"), $publicNetworkPage.find("#tab_ipallocation"), $publicNetworkPage.find("#tab_firewall"), $publicNetworkPage.find("#tab_loadbalancer")];
- var tabContentArray = [$publicNetworkPage.find("#tab_content_details"), $publicNetworkPage.find("#tab_content_ipallocation"), $publicNetworkPage.find("#tab_content_firewall"), $publicNetworkPage.find("#tab_content_loadbalancer")];
- var afterSwitchFnArray = [publicNetworkJsonToDetailsTab, publicNetworkJsonToIpAllocationTab, publicNetworkJsonToFirewallTab, publicNetworkJsonToLoadBalancerTab];
+ //switch between different tabs - Public Network page
+ var $publicNetworkPage = $("#public_network_page");
+ var tabArray = [$publicNetworkPage.find("#tab_details"), $publicNetworkPage.find("#tab_ipallocation"), $publicNetworkPage.find("#tab_firewall"), $publicNetworkPage.find("#tab_loadbalancer")];
+ var tabContentArray = [$publicNetworkPage.find("#tab_content_details"), $publicNetworkPage.find("#tab_content_ipallocation"), $publicNetworkPage.find("#tab_content_firewall"), $publicNetworkPage.find("#tab_content_loadbalancer")];
+ var afterSwitchFnArray = [publicNetworkJsonToDetailsTab, publicNetworkJsonToIpAllocationTab, publicNetworkJsonToFirewallTab, publicNetworkJsonToLoadBalancerTab];
switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);
- //switch between different tabs - Direct Network page
- var $directNetworkPage = $("#direct_network_page");
- var tabArray = [$directNetworkPage.find("#tab_details"), $directNetworkPage.find("#tab_ipallocation")];
- var tabContentArray = [$directNetworkPage.find("#tab_content_details"), $directNetworkPage.find("#tab_content_ipallocation")];
- var afterSwitchFnArray = [directNetworkJsonToDetailsTab, directNetworkJsonToIpAllocationTab];
+ //switch between different tabs - Direct Network page
+ var $directNetworkPage = $("#direct_network_page");
+ var tabArray = [$directNetworkPage.find("#tab_details"), $directNetworkPage.find("#tab_ipallocation")];
+ var tabContentArray = [$directNetworkPage.find("#tab_content_details"), $directNetworkPage.find("#tab_content_ipallocation")];
+ var afterSwitchFnArray = [directNetworkJsonToDetailsTab, directNetworkJsonToIpAllocationTab];
switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);
//initialize dialog
- initDialog("dialog_add_iprange_to_publicnetwork");
- initDialog("dialog_add_external_firewall");
- initDialog("dialog_add_load_balancer");
- initDialog("dialog_add_network_for_zone");
+ initDialog("dialog_add_iprange_to_publicnetwork");
+ initDialog("dialog_add_external_firewall");
+ initDialog("dialog_add_load_balancer");
+ initDialog("dialog_add_network_for_zone");
initDialog("dialog_add_iprange_to_directnetwork");
- networkPopulateMiddleMenu($leftmenuItem1);
- bindAddNetworkButton();
-}
-
+ networkPopulateMiddleMenu($leftmenuItem1);
+ bindAddNetworkButton();
+}
+
function networkPopulateMiddleMenu($leftmenuItem1) {
zoneObj = $leftmenuItem1.data("jsonObj");
if(zoneObj == null)
- return;
+ return;
//populate items into middle menu
var $midmenuContainer = $("#midmenu_container").empty();
@@ -124,7 +124,7 @@ function networkPopulateMiddleMenu($leftmenuItem1) {
listMidMenuItems2(("listNetworks&type=Direct&zoneId="+zoneObj.id), networkGetSearchParams, "listnetworksresponse", "network", directNetworkToMidmenu, directNetworkToRightPanel, directNetworkGetMidmenuId, false, 1);
}
- if(showPublicNetwork == true) { //public network
+ if(showPublicNetwork == true && zoneObj.securitygroupsenabled == false) { //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&trafficType=Public&isSystem=true&zoneId="+zoneObj.id),
@@ -144,12 +144,36 @@ function networkPopulateMiddleMenu($leftmenuItem1) {
}
});
}
+ else if (showPublicNetwork == true && zoneObj.securitygroupsenabled == true){
+ $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&type=Direct&trafficType=Guest&isSystem=true&zoneId="+zoneObj.id),
+ dataType: "json",
+ async: false,
+ success: function(json) {
+ var items = json.listnetworksresponse.network;
+ if(items != null && items.length > 0) {
+ var item = items[0];
+ var $midmenuItem1 = $("#midmenu_item").clone();
+ $midmenuItem1.data("toRightPanelFn", publicNetworkToRightPanel);
+ publicNetworkToMidmenu(item, $midmenuItem1);
+ bindClickToMidMenu($midmenuItem1, publicNetworkToRightPanel, publicNetworkGetMidmenuId);
+ $midmenuContainer.prepend($midmenuItem1.show()); //prepend public network on the top of middle menu
+ $midmenuItem1.click();
+ }
+ }
+ });
+ }
else {
publicNetworkToRightPanel(null);
- }
-}
-
-//***** Public Network (begin) ******************************************************************************************************
+ }
+
+
+
+
+}
+
+//***** Public Network (begin) ******************************************************************************************************
function publicNetworkGetMidmenuId(jsonObj) {
return "midmenuItem_publicnetework_" + jsonObj.id;
}
@@ -159,7 +183,7 @@ function publicNetworkToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.data("jsonObj", jsonObj);
/*
- var $iconContainer = $midmenuItem1.find("#icon_container").show();
+ var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
*/
@@ -170,8 +194,8 @@ function publicNetworkToMidmenu(jsonObj, $midmenuItem1) {
var secondRowText = "VLAN: Multiple";
$midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength));
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
-}
-
+}
+
function publicNetworkToRightPanel($midmenuItem1) {
$("#public_network_page").show();
$("#direct_network_page").hide();
@@ -185,15 +209,15 @@ function publicNetworkToRightPanel($midmenuItem1) {
copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
$("#public_network_page").find("#tab_details").click();
- }
-
- bindAddIpRangeToPublicNetworkButton();
- bindAddExternalFirewallButton();
+ }
+
+ bindAddIpRangeToPublicNetworkButton();
+ bindAddExternalFirewallButton();
bindAddLoadBalancerButton();
}
function publicNetworkJsonToDetailsTab() {
- var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+ var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
@@ -201,8 +225,8 @@ function publicNetworkJsonToDetailsTab() {
if(jsonObj == null)
return;
- var $thisTab = $("#right_panel_content #public_network_page #tab_content_details");
- $thisTab.find("#tab_container").hide();
+ var $thisTab = $("#right_panel_content #public_network_page #tab_content_details");
+ $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$.ajax({
@@ -235,20 +259,20 @@ function publicNetworkJsonToDetailsTab() {
$thisTab.find("#domainid").text(fromdb(jsonObj.domainid));
$thisTab.find("#account").text(fromdb(jsonObj.account));
- //actions ***
+ //actions ***
var $actionLink = $thisTab.find("#action_link");
bindActionLink($actionLink);
- var $actionMenu = $thisTab.find("#action_link #action_menu");
- $actionMenu.find("#action_list").empty();
+ var $actionMenu = $thisTab.find("#action_link #action_menu");
+ $actionMenu.find("#action_list").empty();
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
- $thisTab.find("#tab_container").show();
+ $thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
function publicNetworkJsonToIpAllocationTab() {
- var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+ var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
@@ -256,12 +280,12 @@ function publicNetworkJsonToIpAllocationTab() {
if(jsonObj == null)
return;
- var $thisTab = $("#right_panel_content #public_network_page #tab_content_ipallocation");
- $thisTab.find("#tab_container").hide();
+ var $thisTab = $("#right_panel_content #public_network_page #tab_content_ipallocation");
+ $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$.ajax({
- data: createURL("command=listVlanIpRanges&zoneid="+ jsonObj.zoneid+"&forvirtualnetwork=true"), //don't need networkid because one zone has only one public network
+ data: createURL("command=listVlanIpRanges&zoneid="+ jsonObj.zoneid+"&networkId=" + jsonObj.id),
dataType: "json",
success: function(json) {
var items = json.listvlaniprangesresponse.vlaniprange;
@@ -274,7 +298,7 @@ function publicNetworkJsonToIpAllocationTab() {
$container.append($newTemplate.show());
}
}
- $thisTab.find("#tab_container").show();
+ $thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
});
@@ -295,17 +319,17 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
$template.find("#domain").text(jsonObj.domain);
$template.find("#account").text(jsonObj.account);
- var $actionLink = $template.find("#action_link");
- bindActionLink($actionLink);
-
- var $actionMenu = $actionLink.find("#action_menu");
- $actionMenu.find("#action_list").empty();
-
+ var $actionLink = $template.find("#action_link");
+ bindActionLink($actionLink);
+
+ var $actionMenu = $actionLink.find("#action_menu");
+ $actionMenu.find("#action_list").empty();
+
buildActionLinkForSubgridItem("label.action.delete.IP.range", publicNetworkIpRangeActionMap, $actionMenu, $template);
}
function publicNetworkJsonToFirewallTab() {
- var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+ var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
@@ -313,8 +337,8 @@ function publicNetworkJsonToFirewallTab() {
if(jsonObj == null)
return;
- var $thisTab = $("#right_panel_content #public_network_page #tab_content_firewall");
- $thisTab.find("#tab_container").hide();
+ var $thisTab = $("#right_panel_content #public_network_page #tab_content_firewall");
+ $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$.ajax({
@@ -331,7 +355,7 @@ function publicNetworkJsonToFirewallTab() {
$container.append($newTemplate.show());
}
}
- $thisTab.find("#tab_container").show();
+ $thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
});
@@ -391,12 +415,12 @@ function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
$template.find("#numretries").text(fromdb(jsonObj.numretries));
$template.find("#timeout").text(fromdb(jsonObj.timeout));
- var $actionLink = $template.find("#action_link");
- bindActionLink($actionLink);
-
- var $actionMenu = $actionLink.find("#action_menu");
- $actionMenu.find("#action_list").empty();
-
+ var $actionLink = $template.find("#action_link");
+ bindActionLink($actionLink);
+
+ var $actionMenu = $actionLink.find("#action_menu");
+ $actionMenu.find("#action_list").empty();
+
buildActionLinkForSubgridItem("label.action.delete.firewall", publicNetworkFirewallActionMap, $actionMenu, $template);
}
@@ -414,26 +438,26 @@ var publicNetworkFirewallActionMap = {
}
}
-function doDeleteExternalFirewall($actionLink, $subgridItem) {
- var jsonObj = $subgridItem.data("jsonObj");
- var id = jsonObj.id;
-
- $("#dialog_confirmation")
- .text(dictionary["message.action.delete.external.firewall"])
- .dialog('option', 'buttons', {
- "Confirm": function() {
- $(this).dialog("close");
- var apiCommand = "command=deleteExternalFirewall&id="+id;
- doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem);
- },
- "Cancel": function() {
- $(this).dialog("close");
- }
- }).dialog("open");
+function doDeleteExternalFirewall($actionLink, $subgridItem) {
+ var jsonObj = $subgridItem.data("jsonObj");
+ var id = jsonObj.id;
+
+ $("#dialog_confirmation")
+ .text(dictionary["message.action.delete.external.firewall"])
+ .dialog('option', 'buttons', {
+ "Confirm": function() {
+ $(this).dialog("close");
+ var apiCommand = "command=deleteExternalFirewall&id="+id;
+ doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem);
+ },
+ "Cancel": function() {
+ $(this).dialog("close");
+ }
+ }).dialog("open");
}
function publicNetworkJsonToLoadBalancerTab() {
- var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+ var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
@@ -441,8 +465,8 @@ function publicNetworkJsonToLoadBalancerTab() {
if(jsonObj == null)
return;
- var $thisTab = $("#right_panel_content #public_network_page #tab_content_loadbalancer");
- $thisTab.find("#tab_container").hide();
+ var $thisTab = $("#right_panel_content #public_network_page #tab_content_loadbalancer");
+ $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$.ajax({
@@ -459,7 +483,7 @@ function publicNetworkJsonToLoadBalancerTab() {
$container.append($newTemplate.show());
}
}
- $thisTab.find("#tab_container").show();
+ $thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
});
@@ -478,9 +502,9 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
$template.find("#privateinterface").text(fromdb(jsonObj.privateinterface));
$template.find("#numretries").text(fromdb(jsonObj.numretries));
- var $actionLink = $template.find("#action_link");
- bindActionLink($actionLink);
- /*
+ var $actionLink = $template.find("#action_link");
+ bindActionLink($actionLink);
+ /*
$actionLink.bind("mouseover", function(event) {
$(this).find("#action_menu").show();
return false;
@@ -488,11 +512,11 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
$actionLink.bind("mouseout", function(event) {
$(this).find("#action_menu").hide();
return false;
- });
- */
-
- var $actionMenu = $actionLink.find("#action_menu");
- $actionMenu.find("#action_list").empty();
+ });
+ */
+
+ var $actionMenu = $actionLink.find("#action_menu");
+ $actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("label.action.delete.load.balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);
}
@@ -508,28 +532,28 @@ var publicNetworkLoadBalancerActionMap = {
}
}
}
-
-function doDeleteExternalLoadBalancer($actionLink, $subgridItem) {
- var jsonObj = $subgridItem.data("jsonObj");
- var id = jsonObj.id;
-
- $("#dialog_confirmation")
- .text(dictionary["message.action.delete.external.load.balancer"])
- .dialog('option', 'buttons', {
- "Confirm": function() {
- $(this).dialog("close");
- var apiCommand = "command=deleteExternalLoadBalancer&id="+id;
- doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem);
- },
- "Cancel": function() {
- $(this).dialog("close");
- }
- }).dialog("open");
+
+function doDeleteExternalLoadBalancer($actionLink, $subgridItem) {
+ var jsonObj = $subgridItem.data("jsonObj");
+ var id = jsonObj.id;
+
+ $("#dialog_confirmation")
+ .text(dictionary["message.action.delete.external.load.balancer"])
+ .dialog('option', 'buttons', {
+ "Confirm": function() {
+ $(this).dialog("close");
+ var apiCommand = "command=deleteExternalLoadBalancer&id="+id;
+ doActionToSubgridItem(id, $actionLink, apiCommand, $subgridItem);
+ },
+ "Cancel": function() {
+ $(this).dialog("close");
+ }
+ }).dialog("open");
}
-
-function bindAddIpRangeToPublicNetworkButton() {
- //***** binding Event Handler (begin) ******
- var $dialogAddIpRangeToPublicNetwork = $("#dialog_add_iprange_to_publicnetwork");
+
+function bindAddIpRangeToPublicNetworkButton() {
+ //***** binding Event Handler (begin) ******
+ var $dialogAddIpRangeToPublicNetwork = $("#dialog_add_iprange_to_publicnetwork");
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_tagged").change(function(event) {
if ($(this).val() == "tagged") {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_vlan_container").show();
@@ -544,7 +568,7 @@ function bindAddIpRangeToPublicNetworkButton() {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change();
return false;
- });
+ });
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(function(event) {
if($(this).val() == "zone-wide") {
@@ -558,7 +582,7 @@ function bindAddIpRangeToPublicNetworkButton() {
return false;
});
//***** binding Event Handler (end) ******
-
+
$("#add_iprange_button").unbind("click").bind("click", function(event) {
if($("#public_network_page").find("#tab_content_ipallocation").css("display") == "none")
$("#public_network_page").find("#tab_ipallocation").click();
@@ -567,10 +591,10 @@ function bindAddIpRangeToPublicNetworkButton() {
$dialogAddIpRangeToPublicNetwork.find("#add_publicip_vlan_scope").change(); // default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#domain_container", "#add_publicip_vlan_account_container".
if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
- applyAutoCompleteToDomainChildrenField($dialogAddIpRangeToPublicNetwork.find("#domain"), zoneObj.domainid);
- }
- else { //list all domains
- applyAutoCompleteToDomainField($dialogAddIpRangeToPublicNetwork.find("#domain"));
+ applyAutoCompleteToDomainChildrenField($dialogAddIpRangeToPublicNetwork.find("#domain"), zoneObj.domainid);
+ }
+ else { //list all domains
+ applyAutoCompleteToDomainField($dialogAddIpRangeToPublicNetwork.find("#domain"));
}
$dialogAddIpRangeToPublicNetwork
@@ -595,28 +619,28 @@ function bindAddIpRangeToPublicNetworkButton() {
isValid &= validateIp("End IP Range", $thisDialog.find("#add_publicip_vlan_endip"), $thisDialog.find("#add_publicip_vlan_endip_errormsg"), true); //optional
if($thisDialog.find("#domain_container").css("display") != "none") {
- 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) {
- var items;
- if(zoneObj.domainid != null)
- items = autoCompleteDomains;
- else
- items = autoCompleteDomains;
-
- if(items != null && items.length > 0) {
- for(var i=0; i < items.length; i++) {
- if(fromdb(items[i].name).toLowerCase() == domainName.toLowerCase()) {
- domainId = items[i].id;
- break;
- }
- }
- }
- if(domainId == null) {
- showError(false, $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), g_dictionary["label.not.found"]);
- isValid &= false;
- }
+ 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) {
+ var items;
+ if(zoneObj.domainid != null)
+ items = autoCompleteDomains;
+ else
+ items = autoCompleteDomains;
+
+ if(items != null && items.length > 0) {
+ for(var i=0; i < items.length; i++) {
+ if(fromdb(items[i].name).toLowerCase() == domainName.toLowerCase()) {
+ domainId = items[i].id;
+ break;
+ }
+ }
+ }
+ if(domainId == null) {
+ showError(false, $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+ isValid &= false;
+ }
}
}
@@ -681,19 +705,19 @@ function bindAddIpRangeToPublicNetworkButton() {
"Cancel": function() {
$(this).dialog("close");
}
- }).dialog("open");
- return false;
- });
+ }).dialog("open");
+ return false;
+ });
}
-
-function bindAddExternalFirewallButton() {
- var $dialogAddExternalFirewall = $("#dialog_add_external_firewall");
-
+
+function bindAddExternalFirewallButton() {
+ var $dialogAddExternalFirewall = $("#dialog_add_external_firewall");
+
$("#add_external_firewall_button").show().unbind("click").bind("click", function(event) {
if($("#public_network_page").find("#tab_content_firewall").css("display") == "none")
$("#public_network_page").find("#tab_firewall").click();
- $dialogAddExternalFirewall.find("#info_container").hide();
+ $dialogAddExternalFirewall.find("#info_container").hide();
$dialogAddExternalFirewall.find("#zone_name").text(fromdb(zoneObj.name));
$dialogAddExternalFirewall
@@ -732,10 +756,10 @@ function bindAddExternalFirewallButton() {
//*** construct URL (begin) ***
var url = [];
- var ip = $thisDialog.find("#ip").val();
- if(ip.indexOf("http://")==-1)
- url.push("http://"+ip);
- else
+ var ip = $thisDialog.find("#ip").val();
+ if(ip.indexOf("http://")==-1)
+ url.push("http://"+ip);
+ else
url.push(ip);
var isQuestionMarkAdded = false;
@@ -851,9 +875,9 @@ function bindAddExternalFirewallButton() {
"Cancel": function() {
$(this).dialog("close");
}
- }).dialog("open");
- return false;
- });
+ }).dialog("open");
+ return false;
+ });
}
var publicNetworkIpRangeActionMap = {
@@ -869,15 +893,15 @@ var publicNetworkIpRangeActionMap = {
}
}
-
-function bindAddLoadBalancerButton() {
- var $dialogAddLoadBalancer = $("#dialog_add_load_balancer");
-
+
+function bindAddLoadBalancerButton() {
+ var $dialogAddLoadBalancer = $("#dialog_add_load_balancer");
+
$("#add_load_balancer_button").show().unbind("click").bind("click", function(event) {
if($("#public_network_page").find("#tab_content_loadbalancer").css("display") == "none")
$("#public_network_page").find("#tab_loadbalancer").click();
- $dialogAddLoadBalancer.find("#info_container").hide();
+ $dialogAddLoadBalancer.find("#info_container").hide();
$dialogAddLoadBalancer.find("#zone_name").text(fromdb(zoneObj.name));
$dialogAddLoadBalancer
@@ -912,10 +936,10 @@ function bindAddLoadBalancerButton() {
//*** construct URL (begin) ***
var url = [];
- var ip = $thisDialog.find("#ip").val();
- if(ip.indexOf("http://")==-1)
- url.push("http://"+ip);
- else
+ var ip = $thisDialog.find("#ip").val();
+ if(ip.indexOf("http://")==-1)
+ url.push("http://"+ip);
+ else
url.push(ip);
var isQuestionMarkAdded = false;
@@ -981,15 +1005,15 @@ function bindAddLoadBalancerButton() {
"Cancel": function() {
$(this).dialog("close");
}
- }).dialog("open");
- return false;
- });
+ }).dialog("open");
+ return false;
+ });
}
//***** Public Network (end) ******************************************************************************************************
-
-//***** Direct Network (begin) ******************************************************************************************************
+
+//***** Direct Network (begin) ******************************************************************************************************
function directNetworkGetMidmenuId(jsonObj) {
return "midmenuItem_directnetework_" + jsonObj.id;
}
@@ -999,7 +1023,7 @@ function directNetworkToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.data("jsonObj", jsonObj);
/*
- var $iconContainer = $midmenuItem1.find("#icon_container").show();
+ var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
*/
@@ -1010,19 +1034,19 @@ function directNetworkToMidmenu(jsonObj, $midmenuItem1) {
var secondRowText = "VLAN : " + fromdb(jsonObj.vlan);
$midmenuItem1.find("#second_row").text(secondRowText.substring(0,midMenuSecondRowLength));
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
-}
-
+}
+
function directNetworkToRightPanel($midmenuItem1) {
- copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
- $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
-
- $("#direct_network_page").show();
- bindAddIpRangeToDirectNetworkButton($midmenuItem1);
- $("#add_external_firewall_button").unbind("click").hide();
- $("#add_load_balancer_button").unbind("click").hide();
-
- $("#public_network_page").hide();
-
+ copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
+ $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
+
+ $("#direct_network_page").show();
+ bindAddIpRangeToDirectNetworkButton($midmenuItem1);
+ $("#add_external_firewall_button").unbind("click").hide();
+ $("#add_load_balancer_button").unbind("click").hide();
+
+ $("#public_network_page").hide();
+
$("#direct_network_page").find("#tab_details").click();
}
@@ -1032,7 +1056,7 @@ function directNetworkClearRightPanel() {
}
function directNetworkJsonToDetailsTab() {
- var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+ var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
@@ -1040,8 +1064,8 @@ function directNetworkJsonToDetailsTab() {
if(jsonObj == null)
return;
- var $thisTab = $("#right_panel_content #direct_network_page #tab_content_details");
- $thisTab.find("#tab_container").hide();
+ var $thisTab = $("#right_panel_content #direct_network_page #tab_content_details");
+ $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$.ajax({
@@ -1063,28 +1087,28 @@ function directNetworkJsonToDetailsTab() {
$thisTab.find("#name_edit").val(fromdb(jsonObj.name));
$thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
$thisTab.find("#displaytext_edit").val(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("#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));
$thisTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
$thisTab.find("#networkdomain_edit").val(fromdb(jsonObj.networkdomain));
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
- $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
- $thisTab.find("#domain").text(fromdb(jsonObj.domain)); //might be null
- $thisTab.find("#account").text(fromdb(jsonObj.account)); //might be null
+ $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
+ $thisTab.find("#domain").text(fromdb(jsonObj.domain)); //might be null
+ $thisTab.find("#account").text(fromdb(jsonObj.account)); //might be null
- //actions ***
+ //actions ***
var $actionLink = $thisTab.find("#action_link");
bindActionLink($actionLink);
-
- var $actionMenu = $actionLink.find("#action_menu");
+
+ var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
- buildActionLinkForTab("label.action.edit.network", directNetworkActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.edit.network", directNetworkActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("label.action.delete.network", directNetworkActionMap, $actionMenu, $midmenuItem1, $thisTab);
- $thisTab.find("#tab_container").show();
+ $thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
@@ -1095,26 +1119,26 @@ function directNetworkJsonClearDetailsTab() {
$thisTab.find("#name").text("");
$thisTab.find("#name_edit").val("");
$thisTab.find("#displaytext").text("");
- $thisTab.find("#displaytext_edit").val("");
- $thisTab.find("#default").text("");
- $thisTab.find("#vlan").text("");
- $thisTab.find("#gateway").text("");
+ $thisTab.find("#displaytext_edit").val("");
+ $thisTab.find("#default").text("");
+ $thisTab.find("#vlan").text("");
+ $thisTab.find("#gateway").text("");
$thisTab.find("#netmask").text("");
$thisTab.find("#networkdomain").text("");
$thisTab.find("#networkdomain_edit").val("");
$thisTab.find("#tags").text("");
- $thisTab.find("#tags_edit").val("");
- $thisTab.find("#domain").text("");
+ $thisTab.find("#tags_edit").val("");
+ $thisTab.find("#domain").text("");
$thisTab.find("#account").text("");
- //actions ***
- var $actionMenu = $thisTab.find("#action_link #action_menu");
- $actionMenu.find("#action_list").empty();
+ //actions ***
+ var $actionMenu = $thisTab.find("#action_link #action_menu");
+ $actionMenu.find("#action_list").empty();
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
}
function directNetworkJsonToIpAllocationTab() {
- var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+ var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
@@ -1122,8 +1146,8 @@ function directNetworkJsonToIpAllocationTab() {
if(jsonObj == null)
return;
- var $thisTab = $("#right_panel_content #direct_network_page #tab_content_ipallocation");
- $thisTab.find("#tab_container").hide();
+ var $thisTab = $("#right_panel_content #direct_network_page #tab_content_ipallocation");
+ $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$.ajax({
@@ -1140,7 +1164,7 @@ function directNetworkJsonToIpAllocationTab() {
$container.append($newTemplate.show());
}
}
- $thisTab.find("#tab_container").show();
+ $thisTab.find("#tab_container").show();
$thisTab.find("#tab_spinning_wheel").hide();
}
});
@@ -1162,9 +1186,9 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
$template.find("#vlan").text(jsonObj.vlan);
$template.find("#iprange").text(ipRange);
- var $actionLink = $template.find("#action_link");
- bindActionLink($actionLink);
- /*
+ var $actionLink = $template.find("#action_link");
+ bindActionLink($actionLink);
+ /*
$actionLink.bind("mouseover", function(event) {
$(this).find("#action_menu").show();
return false;
@@ -1172,15 +1196,15 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
$actionLink.bind("mouseout", function(event) {
$(this).find("#action_menu").hide();
return false;
- });
- */
-
- var $actionMenu = $actionLink.find("#action_menu");
- $actionMenu.find("#action_list").empty();
-
+ });
+ */
+
+ var $actionMenu = $actionLink.find("#action_menu");
+ $actionMenu.find("#action_list").empty();
+
buildActionLinkForSubgridItem("label.action.delete.IP.range", directNetworkIpRangeActionMap, $actionMenu, $template);
}
-
+
var directNetworkIpRangeActionMap = {
"label.action.delete.IP.range": {
api: "deleteVlanIpRange",
@@ -1192,13 +1216,13 @@ var directNetworkIpRangeActionMap = {
});
}
}
-}
-
-function bindAddNetworkButton() {
- if(zoneObj == null)
- return;
-
- var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone");
+}
+
+function bindAddNetworkButton() {
+ if(zoneObj == null)
+ return;
+
+ var $dialogAddNetworkForZone = $("#dialog_add_network_for_zone");
if(zoneObj.securitygroupsenabled)
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('');
@@ -1222,9 +1246,9 @@ function bindAddNetworkButton() {
}
return false;
});
-
+
$("#add_network_button").unbind("click").bind("click", function(event) {
- $dialogAddNetworkForZone.find("#info_container").hide();
+ $dialogAddNetworkForZone.find("#info_container").hide();
$dialogAddNetworkForZone.find("#zone_name").text(fromdb(zoneObj.name));
$dialogAddNetworkForZone.find("#add_publicip_vlan_vlan, #add_publicip_vlan_gateway, #add_publicip_vlan_netmask, #add_publicip_vlan_startip, #add_publicip_vlan_endip, #domain, #add_publicip_vlan_account").val("");
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").change();
@@ -1234,10 +1258,10 @@ function bindAddNetworkButton() {
}
else {
if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
- applyAutoCompleteToDomainChildrenField($dialogAddNetworkForZone.find("#domain"), zoneObj.domainid);
- }
- else { //list all domains
- applyAutoCompleteToDomainField($dialogAddNetworkForZone.find("#domain"));
+ applyAutoCompleteToDomainChildrenField($dialogAddNetworkForZone.find("#domain"), zoneObj.domainid);
+ }
+ else { //list all domains
+ applyAutoCompleteToDomainField($dialogAddNetworkForZone.find("#domain"));
}
}
@@ -1264,28 +1288,28 @@ function bindAddNetworkButton() {
isValid &= validateString("Tags", $thisDialog.find("#tags"), $thisDialog.find("#tags_errormsg"), true); //optional
if($thisDialog.find("#domain_container").css("display") != "none") {
- 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) {
- var items;
- if(zoneObj.domainid != null)
- items = autoCompleteDomains;
- else
- items = autoCompleteDomains;
-
- if(items != null && items.length > 0) {
- for(var i=0; i < items.length; i++) {
- if(fromdb(items[i].name).toLowerCase() == domainName.toLowerCase()) {
- domainId = items[i].id;
- break;
- }
- }
- }
- if(domainId == null) {
- showError(false, $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), g_dictionary["label.not.found"]);
- isValid &= false;
- }
+ 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) {
+ var items;
+ if(zoneObj.domainid != null)
+ items = autoCompleteDomains;
+ else
+ items = autoCompleteDomains;
+
+ if(items != null && items.length > 0) {
+ for(var i=0; i < items.length; i++) {
+ if(fromdb(items[i].name).toLowerCase() == domainName.toLowerCase()) {
+ domainId = items[i].id;
+ break;
+ }
+ }
+ }
+ if(domainId == null) {
+ showError(false, $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), g_dictionary["label.not.found"]);
+ isValid &= false;
+ }
}
}
@@ -1388,20 +1412,20 @@ function bindAddNetworkButton() {
"Cancel": function() {
$(this).dialog("close");
}
- }).dialog("open");
- return false;
- });
-}
+ }).dialog("open");
+ return false;
+ });
+}
-function bindAddIpRangeToDirectNetworkButton($midmenuItem1) {
- var jsonObj = $midmenuItem1.data("jsonObj");
-
+function bindAddIpRangeToDirectNetworkButton($midmenuItem1) {
+ var jsonObj = $midmenuItem1.data("jsonObj");
+
$("#add_iprange_button").unbind("click").bind("click", function(event) {
if($("#direct_network_page").find("#tab_content_ipallocation").css("display") == "none")
$("#direct_network_page").find("#tab_ipallocation").click();
-
- var $dialogAddIpRangeToDirectNetwork = $("#dialog_add_iprange_to_directnetwork");
- $dialogAddIpRangeToDirectNetwork.find("#directnetwork_name").text(fromdb(jsonObj.name));
+
+ var $dialogAddIpRangeToDirectNetwork = $("#dialog_add_iprange_to_directnetwork");
+ $dialogAddIpRangeToDirectNetwork.find("#directnetwork_name").text(fromdb(jsonObj.name));
$dialogAddIpRangeToDirectNetwork.find("#zone_name").text(fromdb(zoneObj.name));
if(zoneObj.securitygroupsenabled)
@@ -1479,9 +1503,9 @@ function bindAddIpRangeToDirectNetworkButton($midmenuItem1) {
"Cancel": function() {
$(this).dialog("close");
}
- }).dialog("open");
- return false;
- });
+ }).dialog("open");
+ return false;
+ });
}
var directNetworkActionMap = {
@@ -1633,22 +1657,22 @@ function doEditDirectNetwork2($actionLink, $detailsTab, $midmenuItem1, $readonly
});
}
-function doDeleteDirectNetwork($actionLink, $detailsTab, $midmenuItem1) {
- var jsonObj = $midmenuItem1.data("jsonObj");
- var id = jsonObj.id;
-
- $("#dialog_confirmation")
- .text(dictionary["message.action.delete.network"])
- .dialog('option', 'buttons', {
- "Confirm": function() {
- $(this).dialog("close");
- var apiCommand = "command=deleteNetwork&id="+id;
- doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
- },
- "Cancel": function() {
- $(this).dialog("close");
- }
- }).dialog("open");
+function doDeleteDirectNetwork($actionLink, $detailsTab, $midmenuItem1) {
+ var jsonObj = $midmenuItem1.data("jsonObj");
+ var id = jsonObj.id;
+
+ $("#dialog_confirmation")
+ .text(dictionary["message.action.delete.network"])
+ .dialog('option', 'buttons', {
+ "Confirm": function() {
+ $(this).dialog("close");
+ var apiCommand = "command=deleteNetwork&id="+id;
+ doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
+ },
+ "Cancel": function() {
+ $(this).dialog("close");
+ }
+ }).dialog("open");
}
//***** Direct Network (end) ******************************************************************************************************