cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajeshbatt...@apache.org
Subject git commit: updated refs/heads/master to d64adf5
Date Wed, 02 Jul 2014 10:57:57 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 421d6029d -> d64adf591


CLOUDSTACK-7037 Unable to add new vm/service to existing LB rule of SSL protocol


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

Branch: refs/heads/master
Commit: d64adf59126ec41905977ffb14fde167e7e305aa
Parents: 421d602
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Wed Jul 2 16:06:12 2014 +0530
Committer: Rajesh Battala <rajesh.battala@citrix.com>
Committed: Wed Jul 2 16:06:39 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d64adf59/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 93b084e..ff51ef9 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
@@ -632,7 +632,11 @@ public class NetscalerResource implements ServerResource {
                                 newService.set_port(destination.getDestPort());
                                 newService.set_servername(nsServerName);
                                 newService.set_state("ENABLED");
-                                newService.set_servicetype(lbProtocol);
+                                if(lbProtocol.equalsIgnoreCase(NetUtils.SSL_PROTO)) {
+                                    newService.set_servicetype(NetUtils.HTTP_PROTO);
+                                } else {
+                                    newService.set_servicetype(lbProtocol);
+                                }
 
                                 apiCallResult = com.citrix.netscaler.nitro.resource.config.basic.service.add(_netscalerService,
newService);
                                 if (apiCallResult.errorcode != 0) {


Mime
View raw message