Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63D3B95CC for ; Thu, 16 May 2013 17:12:32 +0000 (UTC) Received: (qmail 86683 invoked by uid 500); 16 May 2013 17:12:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 86623 invoked by uid 500); 16 May 2013 17:12:24 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 85560 invoked by uid 99); 16 May 2013 17:12:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 17:12:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3BE2F14DC0; Thu, 16 May 2013 17:12:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 16 May 2013 17:12:57 -0000 Message-Id: <794d24711b03447dae4b37ce5ece9386@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/39] git commit: updated refs/heads/ui-vpc-redesign to 8d9a8ca CLOUDSTACK-2462: Failed to create GSLB rule with "proximity" algorithm add RTT as load balancing method for GSLB vserver Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33e68391 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33e68391 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33e68391 Branch: refs/heads/ui-vpc-redesign Commit: 33e683915c3083ac60a578fc90a7d90a64cb028e Parents: d2d0398 Author: Murali Reddy Authored: Thu May 16 15:18:02 2013 +0530 Committer: Murali Reddy Committed: Thu May 16 15:19:42 2013 +0530 ---------------------------------------------------------------------- .../cloud/network/resource/NetscalerResource.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/33e68391/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 98e1461..c0d4599 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 @@ -1095,7 +1095,15 @@ public class NetscalerResource implements ServerResource { } vserver.set_name(vserverName); - vserver.set_lbmethod(lbMethod); + if ("RoundRobin".equalsIgnoreCase(lbMethod)) { + vserver.set_lbmethod("ROUNDROBIN"); + } else if ("LeastConn".equalsIgnoreCase(lbMethod)) { + vserver.set_lbmethod("LEASTCONNECTION"); + } else if ("Proximity".equalsIgnoreCase(lbMethod)) { + vserver.set_lbmethod("RTT"); + } else { + throw new ExecutionException("Unsupported LB method"); + } vserver.set_persistencetype(persistenceType); if ("SOURCEIP".equalsIgnoreCase(persistenceType)) { vserver.set_persistenceid(persistenceId);