cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/master to bd238ce
Date Tue, 10 Dec 2013 02:39:07 GMT
Updated Branches:
  refs/heads/master c60a256eb -> bd238ce24


CLOUDSTACK-5431: permit 'http' as service type for GSLB rule


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

Branch: refs/heads/master
Commit: bd238ce24ecd8a5c9143f2c8b3dc395b26b91c72
Parents: c60a256
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Tue Dec 10 08:07:22 2013 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Tue Dec 10 08:08:24 2013 +0530

----------------------------------------------------------------------
 api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java        | 6 ++++--
 .../user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd238ce2/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
index 946c2f9..c5fd9ae 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
@@ -50,9 +50,11 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity,
Cont
     }
 
     enum ServiceType {
-        tcp, udp;
+        tcp, udp, http;
         public static boolean isValidServiceType(String serviceType) {
-            if (tcp.name().equalsIgnoreCase(serviceType) || udp.name().equalsIgnoreCase(serviceType))
{
+            if (tcp.name().equalsIgnoreCase(serviceType) ||
+                    udp.name().equalsIgnoreCase(serviceType) ||
+                    http.name().equalsIgnoreCase(serviceType)) {
                 return true;
             }
             return false;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd238ce2/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
index bf2d86f..550d817 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java
@@ -87,7 +87,7 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd
{
     @Parameter(name = ApiConstants.GSLB_SERVICE_DOMAIN_NAME, type = CommandType.STRING, required
= true, description = "domain name for the GSLB service.")
     private String serviceDomainName;
 
-    @Parameter(name = ApiConstants.GSLB_SERVICE_TYPE, type = CommandType.STRING, required
= true, description = "GSLB service type (tcp, udp)")
+    @Parameter(name = ApiConstants.GSLB_SERVICE_TYPE, type = CommandType.STRING, required
= true, description = "GSLB service type (tcp, udp, http)")
     private String serviceType;
 
     /////////////////////////////////////////////////////


Mime
View raw message