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/4.3 to 79cb891
Date Wed, 11 Dec 2013 10:12:04 GMT
Updated Branches:
  refs/heads/4.3 4fb54ca32 -> 79cb891ef


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

Conflicts:
	api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
	api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java


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

Branch: refs/heads/4.3
Commit: 79cb891efc2aeb67a6c928d5723c6c70fb1a1363
Parents: 4fb54ca
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Tue Dec 10 08:07:22 2013 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Wed Dec 11 15:40:51 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79cb891e/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 597304f..7a82412 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
@@ -53,10 +53,11 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity,
Cont
     }
 
     enum ServiceType {
-        tcp,
-        udp;
-        public static  boolean isValidServiceType(String serviceType) {
-            if (tcp.name().equalsIgnoreCase(serviceType) || udp.name().equalsIgnoreCase(serviceType))
{
+        tcp, udp, http;
+        public static boolean isValidServiceType(String 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/79cb891e/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 57b227d..fcc83e4 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
@@ -70,7 +70,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