cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/4.2 to cb6ff00
Date Mon, 05 Aug 2013 14:04:06 GMT
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 <muralimmreddy@gmail.com>
Authored: Mon Aug 5 19:31:29 2013 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
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);


Mime
View raw message