From 433be68a6c3372bdba30ba05c1c6eda64944bb88 Mon Sep 17 00:00:00 2001 From: Will Stevens Date: Tue, 22 Jul 2014 17:28:01 -0400 Subject: [PATCH] CLOUDSTACK-6886 - Fixed the issue created by the SSL feature with the SDX: --- .../src/com/cloud/network/resource/NetscalerResource.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 4cd70cb7884..5142d968fd1 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 @@ -248,7 +248,7 @@ public class NetscalerResource implements ServerResource { //enable load balancing feature enableLoadBalancingFeature(); - SSL.enableSslFeature(_netscalerService); + SSL.enableSslFeature(_netscalerService, _isSdx); //if the the device is cloud stack provisioned then make it part of the public network if (_cloudManaged) { @@ -1927,8 +1927,10 @@ public class NetscalerResource implements ServerResource { } } - - private static void enableSslFeature(nitro_service ns) throws ExecutionException { + private static void enableSslFeature(nitro_service ns, boolean isSdx) throws ExecutionException { + if (isSdx) { + return; + } try { base_response result = ns.enable_features(new String[]{"SSL"}); if (result.errorcode != 0)