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 6BE0710136 for ; Mon, 5 Aug 2013 14:04:07 +0000 (UTC) Received: (qmail 27131 invoked by uid 500); 5 Aug 2013 14:04:07 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 27106 invoked by uid 500); 5 Aug 2013 14:04:07 -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 27094 invoked by uid 99); 5 Aug 2013 14:04:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Aug 2013 14:04:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9093E8B8DAC; Mon, 5 Aug 2013 14:04:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Message-Id: <76e5d3e4d8ff4c868eba112a2bda2ce7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to cb6ff00 Date: Mon, 5 Aug 2013 14:04:06 +0000 (UTC) Updated Branches: refs/heads/4.2 cd278cff4 -> cb6ff00ef 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/cb6ff00e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb6ff00e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb6ff00e Branch: refs/heads/4.2 Commit: cb6ff00ef6f4e625a93d8e7ec4a1c2cf5895232a Parents: cd278cf Author: Murali Reddy Authored: Mon Aug 5 19:31:29 2013 +0530 Committer: Murali Reddy Committed: Mon Aug 5 19:33:35 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/cb6ff00e/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);