This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 49be7ee CLOUDSTACK-9800: Enabled netscaler inline mode. Added
corrsponding changes in UI (#1964)
49be7ee is described below
commit 49be7eecd2e7db33a421b8680e4e8806a3d63952
Author: kishankavala <kishankav...@users.noreply.github.com>
AuthorDate: Tue Dec 19 04:18:55 2017 +0530
CLOUDSTACK-9800: Enabled netscaler inline mode. Added corrsponding changes
in UI (#1964)
NetScaler can work in inline mode also along with other Firewall devices.
Enabled netscaler inline mode capability
---
.../netscaler/src/com/cloud/network/element/NetscalerElement.java | 3 +++
ui/scripts/configuration.js | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
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 2041735..38a836d 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
@@ -509,6 +509,9 @@ public class NetscalerElement extends
ExternalLoadBalancerDeviceManagerImpl
// Supports only Public load balancing
lbCapabilities.put(Capability.LbSchemes,
LoadBalancerContainer.Scheme.Public.toString());
+ // Support inline mode with firewall
+ lbCapabilities.put(Capability.InlineMode, "true");
+
// Specifies that load balancing rules can support autoscaling and the
list of counters it supports
// list of counters it supports
AutoScaleCounter counter;
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 00972b6..cd4bad4 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -2634,7 +2634,7 @@
//hide/show service fields ***** (end)
*****
//show LB InlineMode dropdown only
when (1)LB service is checked and LB service provider is F5BigIp (2)Firewall
service is checked and Firewall service provider is JuniperSRX
- if
((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked')
== true) &&
(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val()
== 'F5BigIp') &&
+ if
((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked')
== true) &&
((args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val()
== 'F5BigIp') ||
(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val()
== 'Netscaler')) &&
(args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"]').find('input[type=checkbox]').is(':checked')
== true) &&
(args.$form.find('.form-item[rel=\"service.Firewall.provider\"]').find('select').val()
== 'JuniperSRX')) {
args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').css('display',
'inline-block');
} else {
@@ -3267,7 +3267,7 @@
inputData['servicecapabilitylist['
+ serviceCapabilityIndex + '].capabilitytype'] = 'ElasticLb';
inputData['servicecapabilitylist['
+ serviceCapabilityIndex + '].capabilityvalue'] = true; //because this
checkbox's value == "on"
serviceCapabilityIndex++;
- } else if ((key ==
'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) &&
(serviceProviderMap.Lb == "F5BigIp")) {
+ } else if ((key ==
'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) &&
((serviceProviderMap.Lb == "F5BigIp") || (serviceProviderMap.Lb ==
"Netscaler"))) {
if (value == 'true') { //CS-16605
do not pass parameter if value is 'false'(side by side)
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] =
'lb';
inputData['servicecapabilitylist[' + serviceCapabilityIndex +
'].capabilitytype'] = 'InlineMode';
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].
