From 5577e0c9ca7490be3e02945b89a1504a69c9fb27 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 23 Dec 2010 20:22:14 -0800 Subject: [PATCH] IP Address page - create load balancer rule - populate algorithm dropdown with network data instead of hard-coding. --- ui/jsp/ipaddress.jsp | 4 +++- ui/scripts/cloud.core.ipaddress.js | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp index 041929c4598..0886a74cae0 100644 --- a/ui/jsp/ipaddress.jsp +++ b/ui/jsp/ipaddress.jsp @@ -305,10 +305,12 @@
- +
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 1be7b33f890..27b84eade23 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -425,6 +425,8 @@ function ipJsonToLoadBalancerTab() { if(ipObj == null) return; + var networkObj = $midmenuItem1.data("networkObj"); + var ipAddress = ipObj.ipaddress; if(ipAddress == null || ipAddress.length == 0) return; @@ -432,7 +434,14 @@ function ipJsonToLoadBalancerTab() { var $thisTab = $("#right_panel_content #tab_content_load_balancer"); $thisTab.find("#tab_container").hide(); $thisTab.find("#tab_spinning_wheel").show(); - + + if(networkObj.service[6].name == "Lb" && networkObj.service[6].capability[0].name == "SupportedLbAlgorithms") { + var algorithms = networkObj.service[6].capability[0].value; //e.g. "roundrobin,leastconn,sourceip" + var array1 = algorithms.split(","); + var $algorithmField = $("#create_load_balancer_row").find("#algorithm_select").empty(); + for(var i=0; i"+array1[i]+"") + } refreshCreateLoadBalancerRow(); $.ajax({