Updated Branches: refs/heads/master 63a676f15 -> 7186d6d43
Rest API changes to get deployment policy name when subscribing Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7186d6d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7186d6d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7186d6d4 Branch: refs/heads/master Commit: 7186d6d438f3cd724bd99f2468bd96deb0188040 Parents: 63a676f Author: Isuru <[email protected]> Authored: Sun Dec 8 13:13:40 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 8 13:13:40 2013 +0530 ---------------------------------------------------------------------- .../rest/endpoint/bean/CartridgeInfoBean.java | 19 ++++++++++++++----- .../rest/endpoint/services/ServiceUtils.java | 4 ++-- .../rest/endpoint/services/StratosAdmin.java | 3 ++- 3 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7186d6d4/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java index 27ce962..7ff19b3 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java @@ -23,7 +23,8 @@ import javax.xml.bind.annotation.XmlRootElement; public class CartridgeInfoBean { String cartridgeType; String alias; - String policy; + String autoscalePolicy; + String deploymentPolicy; String repoURL; boolean privateRepo; String repoUsername; @@ -48,12 +49,12 @@ public class CartridgeInfoBean { this.alias = alias; } - public String getPolicy() { - return policy; + public String getAutoscalePolicy() { + return autoscalePolicy; } - public void setPolicy(String policy) { - this.policy = policy; + public void setAutoscalePolicy(String autoscalePolicy) { + this.autoscalePolicy = autoscalePolicy; } public String getRepoURL() { @@ -103,4 +104,12 @@ public class CartridgeInfoBean { public void setDataCartridgeAlias(String dataCartridgeAlias) { this.dataCartridgeAlias = dataCartridgeAlias; } + + public String getDeploymentPolicy() { + return deploymentPolicy; + } + + public void setDeploymentPolicy(String deploymentPolicy) { + this.deploymentPolicy = deploymentPolicy; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7186d6d4/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 db14171..f99a16d 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 @@ -482,7 +482,7 @@ public class ServiceUtils { } - static SubscriptionInfo subscribe(String cartridgeType, String alias, String policy, String repoURL, + static SubscriptionInfo subscribe(String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy, String repoURL, boolean privateRepo, String repoUsername, String repoPassword, String dataCartridgeType, String dataCartridgeAlias, ConfigurationContext configurationContext, String userName, String tenantDomain) throws ADCException, PolicyException, UnregisteredCartridgeException, InvalidCartridgeAliasException, DuplicateCartridgeAliasException, RepositoryRequiredException, @@ -491,7 +491,7 @@ public class ServiceUtils { CartridgeSubscription cartridgeSubscription = cartridgeSubsciptionManager.subscribeToCartridge(cartridgeType, - alias.trim(), policy, tenantDomain, ApplicationManagementUtil.getTenantId(configurationContext), + alias.trim(), autoscalingPolicy, deploymentPolicy ,tenantDomain, ApplicationManagementUtil.getTenantId(configurationContext), userName, "git", repoURL, privateRepo, repoUsername, repoPassword); if(dataCartridgeAlias != null && !dataCartridgeAlias.trim().isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7186d6d4/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java index 0752b7b..67a48be 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java @@ -231,7 +231,8 @@ public class StratosAdmin extends AbstractAdmin { try { return ServiceUtils.subscribe(cartridgeInfoBean.getCartridgeType(), cartridgeInfoBean.getAlias(), - cartridgeInfoBean.getPolicy(), + cartridgeInfoBean.getAutoscalePolicy(), + cartridgeInfoBean.getDeploymentPolicy(), cartridgeInfoBean.getRepoURL(), cartridgeInfoBean.isPrivateRepo(), cartridgeInfoBean.getRepoUsername(),
