Repository: cloudstack Updated Branches: refs/heads/4.4 9de4abeb4 -> ba025c9a7
CLOUDSTACK-6886: fixed netscaler sdx issue with the ssl feature Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/877c2d2f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/877c2d2f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/877c2d2f Branch: refs/heads/4.4 Commit: 877c2d2f6dbc94aa3e093da101f48751e5668f26 Parents: c9383c4 Author: Will Stevens <[email protected]> Authored: Wed Jul 23 13:29:05 2014 -0400 Committer: Will Stevens <[email protected]> Committed: Wed Jul 23 13:29:05 2014 -0400 ---------------------------------------------------------------------- .../src/com/cloud/network/resource/NetscalerResource.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/877c2d2f/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 97a0787..c4250b6 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) { @@ -1909,7 +1909,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)
