Updated Branches: refs/heads/master bf3895f8b -> edfc3c425
adding a payload parameter LOAD_BALANCED_SERVICE_TYPE to indicateh the loab balanced service type Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/166943f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/166943f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/166943f2 Branch: refs/heads/master Commit: 166943f24089013998d98e862b3f3d8c3c4b6c3c Parents: 3df2046 Author: Isuru <[email protected]> Authored: Thu Jan 16 16:02:35 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Jan 16 16:02:35 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/rest/endpoint/services/ServiceUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/166943f2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 513bf2b..5f9710b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -744,7 +744,7 @@ public class ServiceUtils { // if lb cluster doesn't exist String lbAlias = "lb" + new Random().nextInt(); lbCartridgeInfo.addProperties(property); - subscribeToLb(lbCartridgeType, + subscribeToLb(lbCartridgeType, cartridgeType, lbAlias, lbCartridgeInfo.getDefaultAutoscalingPolicy(), deploymentPolicy, configurationContext, @@ -801,7 +801,7 @@ public class ServiceUtils { lbCartridgeInfo.addProperties(property); lbCartridgeInfo.addProperties(loadBalancedServiceTypeProperty); - subscribeToLb(lbCartridgeType, + subscribeToLb(lbCartridgeType, cartridgeType, lbAlias, lbCartridgeInfo.getDefaultAutoscalingPolicy(), deploymentPolicy, @@ -905,7 +905,7 @@ public class ServiceUtils { } - private static void subscribeToLb(String cartridgeType, String lbAlias, + private static void subscribeToLb(String cartridgeType, String loadBalancedCartridgeType, String lbAlias, String defaultAutoscalingPolicy, String deploymentPolicy, ConfigurationContext configurationContext, String userName, String tenantDomain, Property[] props) throws ADCException { @@ -918,6 +918,9 @@ public class ServiceUtils { deploymentPolicy ,tenantDomain, ApplicationManagementUtil.getTenantId(configurationContext), userName, "git", null, false, null, null, props); + + //set a payload parameter to indicate the load balanced cartridge type + cartridgeSubscription.getPayloadData().add("LOAD_BALANCED_SERVICE_TYPE", loadBalancedCartridgeType); cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription);
