You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/20 11:01:34 UTC

[1/2] git commit: updated refs/heads/master to ca27394

Repository: cloudstack
Updated Branches:
  refs/heads/master 248c3f72c -> ca27394da


CLOUDSTACK-9618: Load Balancer configuration page does not have "Source" method in the drop down list

Added the source method to supported algorithm list in Netscaler element.
Added a validation check.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3dc0eed7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3dc0eed7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3dc0eed7

Branch: refs/heads/master
Commit: 3dc0eed71d8c6b39d16b003f779949ba13abdf10
Parents: 13bfdd7
Author: Nitin Kumar Maharana <ni...@accelerite.com>
Authored: Tue Dec 6 13:57:21 2016 +0530
Committer: Nitin Kumar Maharana <ni...@accelerite.com>
Committed: Wed Feb 15 01:16:48 2017 +0530

----------------------------------------------------------------------
 .../src/com/cloud/network/element/NetscalerElement.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3dc0eed7/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
index 53225be..dbf6d9a 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
@@ -232,6 +232,10 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl
 
     @Override
     public boolean validateLBRule(Network network, LoadBalancingRule rule) {
+        if (canHandle(network, Service.Lb)) {
+            String algo = rule.getAlgorithm();
+            return (algo.equals("roundrobin") || algo.equals("leastconn") || algo.equals("source"));
+        }
         return true;
     }
 
@@ -260,7 +264,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl
         Map<Capability, String> lbCapabilities = new HashMap<Capability, String>();
 
         // Specifies that the RoundRobin and Leastconn algorithms are supported for load balancing rules
-        lbCapabilities.put(Capability.SupportedLBAlgorithms, "roundrobin,leastconn");
+        lbCapabilities.put(Capability.SupportedLBAlgorithms, "roundrobin, leastconn, source");
 
         // specifies that Netscaler network element can provided both shared and isolation modes
         lbCapabilities.put(Capability.SupportedLBIsolation, "dedicated, shared");


[2/2] git commit: updated refs/heads/master to ca27394

Posted by ra...@apache.org.
Merge pull request #1786 from nitin-maharana/nitin5

CLOUDSTACK-9618: Load Balancer configuration page does not have "Source" method in the drop down list.If we create an isolated network with NetScaler published service offering for Load balancing service, then the load balancing configuration UI does not show "Source" as one of the supported LB methods in the drop down list. It only shows "Round-Robin" and "LeastConnection" methods in the list. However, It successfully creates LB rule with "Source" as the LB method using API.

* pr/1786:
  CLOUDSTACK-9618: Load Balancer configuration page does not have "Source" method in the drop down list

Signed-off-by: Rajani Karuturi <ra...@accelerite.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca27394d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca27394d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca27394d

Branch: refs/heads/master
Commit: ca27394da1fdbf2bf543082edb7b8324953c8a04
Parents: 248c3f7 3dc0eed
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Mon Feb 20 16:29:52 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Mon Feb 20 16:29:53 2017 +0530

----------------------------------------------------------------------
 .../src/com/cloud/network/element/NetscalerElement.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------