From bd238ce24ecd8a5c9143f2c8b3dc395b26b91c72 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Tue, 10 Dec 2013 08:07:22 +0530 Subject: [PATCH] CLOUDSTACK-5431: permit 'http' as service type for GSLB rule --- api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java | 6 ++++-- .../region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java index 946c2f93b32..c5fd9aed2b6 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; 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 bf2d86f50c9..550d81755eb 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; /////////////////////////////////////////////////////