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

murali-reddy · murali-reddy · commit bd238ce24ecd · 2013-12-10T08:08:24.000+05:30
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
@@ -50,9 +50,11 @@ public static boolean isValidPersistence(String persistence) {
     }
 
     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
@@ -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;
 
     /////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,11 @@ public static boolean isValidPersistence(String persistence) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`enum ServiceType {`
`53`		`- tcp, udp;`
	`53`	`+ tcp, udp, http;`
`54`	`54`	`public static boolean isValidServiceType(String serviceType) {`
`55`		`- if (tcp.name().equalsIgnoreCase(serviceType) \|\| udp.name().equalsIgnoreCase(serviceType)) {`
	`55`	`+ if (tcp.name().equalsIgnoreCase(serviceType) \|\|`
	`56`	`+ udp.name().equalsIgnoreCase(serviceType) \|\|`
	`57`	`+ http.name().equalsIgnoreCase(serviceType)) {`
`56`	`58`	`return true;`
`57`	`59`	`}`
`58`	`60`	`return false;`