Updated Branches: refs/heads/master 7b5f4bd99 -> ea5be1376
CLOUDSTACK-4048:[GSLB] Failed to assign more than one LB rule to a GSLB rule that is created with gslbmethod=leastconn Netscaler nitro api to add gslb virtual servers fails for some reason if both netmask and round robin methods are specified. So working around with settign netmask to be null while updating vserver. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea5be137 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea5be137 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea5be137 Branch: refs/heads/master Commit: ea5be13761c407e144c2094ecca932bdbfb8f265 Parents: 7b5f4bd Author: Murali Reddy <[email protected]> Authored: Mon Aug 5 19:31:29 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Mon Aug 5 19:36:25 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/network/resource/NetscalerResource.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea5be137/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java index c82fde2..e42a9ea 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java @@ -1134,10 +1134,9 @@ public class NetscalerResource implements ServerResource { vserver.set_cookietimeout(null); vserver.set_domainname(null); if (isUpdateSite) { - if ("roundrobin".equalsIgnoreCase(lbMethod)) { - vserver.set_netmask(null); - vserver.set_v6netmasklen(null); - } + // both netmask and LB method can not be specified while update so set to null + vserver.set_netmask(null); + vserver.set_v6netmasklen(null); gslbvserver.update(client, vserver); } else { gslbvserver.add(client, vserver);
