Skip to content

Commit 49be7ee

Browse files
kishankavalayadvr
authored andcommitted
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
1 parent 1edb3e8 commit 49be7ee

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,9 @@ public Map<Service, Map<Capability, String>> getCapabilities() {
509509
// Supports only Public load balancing
510510
lbCapabilities.put(Capability.LbSchemes, LoadBalancerContainer.Scheme.Public.toString());
511511

512+
// Support inline mode with firewall
513+
lbCapabilities.put(Capability.InlineMode, "true");
514+
512515
// Specifies that load balancing rules can support autoscaling and the list of counters it supports
513516
// list of counters it supports
514517
AutoScaleCounter counter;

ui/scripts/configuration.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,7 +2634,7 @@
26342634
//hide/show service fields ***** (end) *****
26352635

26362636
//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
2637-
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') &&
2637+
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')) &&
26382638
(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')) {
26392639
args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').css('display', 'inline-block');
26402640
} else {
@@ -3267,7 +3267,7 @@
32673267
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticLb';
32683268
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on"
32693269
serviceCapabilityIndex++;
3270-
} else if ((key == 'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) && (serviceProviderMap.Lb == "F5BigIp")) {
3270+
} else if ((key == 'service.Lb.inlineModeDropdown') && ("Lb" in serviceProviderMap) && ((serviceProviderMap.Lb == "F5BigIp") || (serviceProviderMap.Lb == "Netscaler"))) {
32713271
if (value == 'true') { //CS-16605 do not pass parameter if value is 'false'(side by side)
32723272
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb';
32733273
inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'InlineMode';

0 commit comments

Comments
 (0)