Updated Branches: refs/heads/master c30afba9d -> 63a676f15
changing cartridge subscription to take deployment policy name and removing autoscaling policy detection at SM Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f163f22f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f163f22f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f163f22f Branch: refs/heads/master Commit: f163f22fe2d23f25efcbcd21afa297caedcbf259 Parents: 3780649 Author: Isuru <[email protected]> Authored: Sun Dec 8 13:05:07 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 8 13:05:07 2013 +0530 ---------------------------------------------------------------------- .../client/CloudControllerServiceClient.java | 3 +- .../manager/CartridgeSubscriptionManager.java | 19 +++++++------ .../adc/mgt/payload/NonCarbonPayload.java | 13 ++++----- .../DatabaseBasedPersistenceManager.java | 13 ++++----- .../service/ApplicationManagementService.java | 2 +- .../ApplicationCartridgeSubscription.java | 9 +++--- .../mgt/subscription/CartridgeSubscription.java | 29 +++++++++++++------- .../subscription/CartridgeSubscription_old.java | 8 +++--- .../subscription/DataCartridgeSubscription.java | 13 +++++---- .../DataCartridgeSubscription_old.java | 4 +-- .../FrameworkCartridgeSubscription.java | 9 +++--- .../MultiTenantCartridgeSubscription.java | 2 +- .../SingleTenantCartridgeSubscription.java | 2 +- .../SubscriptionSingleTenantBehaviour.java | 2 ++ .../mgt/utils/ApplicationManagementUtil.java | 10 ++++--- .../cloud/controller/pojo/Registrant.java | 10 ++++++- .../main/resources/CloudControllerService.wsdl | 13 +++++---- 17 files changed, 91 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java index 4434625..5f5adae 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java @@ -101,7 +101,7 @@ public class CloudControllerServiceClient { public boolean register(String clusterId, String cartridgeType, String payload, String tenantRange, String hostName, Properties properties, - String autoscalorPolicyName) throws RemoteException, + String autoscalorPolicyName, String deploymentPolicyName) throws RemoteException, CloudControllerServiceUnregisteredCartridgeExceptionException, CloudControllerServiceIllegalArgumentExceptionException { @@ -114,6 +114,7 @@ public class CloudControllerServiceClient { registrant.setProperties(props); registrant.setPayload(payload); registrant.setAutoScalerPolicyName(autoscalorPolicyName); + registrant.setDeploymentPolicyName(deploymentPolicyName); return stub.registerService(registrant); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java index d58defb..04daa0e 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java @@ -27,7 +27,6 @@ import org.apache.stratos.adc.mgt.client.CloudControllerServiceClient; import org.apache.stratos.adc.mgt.connector.CartridgeSubscriptionConnector; import org.apache.stratos.adc.mgt.connector.CartridgeSubscriptionConnectorFactory; import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.dto.SubscriptionInfo; import org.apache.stratos.adc.mgt.exception.*; import org.apache.stratos.adc.mgt.payload.Payload; @@ -40,7 +39,6 @@ import org.apache.stratos.adc.mgt.subscription.factory.CartridgeSubscriptionFact import org.apache.stratos.adc.mgt.utils.ApplicationManagementUtil; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; import org.apache.stratos.adc.mgt.utils.PersistenceManager; -import org.apache.stratos.adc.mgt.utils.PolicyHolder; import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.pojo.Property; import org.wso2.carbon.context.CarbonContext; @@ -63,6 +61,7 @@ public class CartridgeSubscriptionManager { * @param cartridgeType Cartridge type * @param cartridgeAlias Cartridge alias * @param autoscalingPolicyName Autoscaling policy name + * @param deploymentPolicyName Deployment Policy name * @param tenantDomain Subscriing tenant's domain * @param tenantId Subscribing tenant's Id * @param tenantAdminUsername Subscribing tenant's admin user name @@ -85,7 +84,8 @@ public class CartridgeSubscriptionManager { * @throws InvalidRepositoryException */ public CartridgeSubscription subscribeToCartridge (String cartridgeType, String cartridgeAlias, - String autoscalingPolicyName, String tenantDomain, int tenantId, + String autoscalingPolicyName, String deploymentPolicyName, + String tenantDomain, int tenantId, String tenantAdminUsername, String repositoryType, String repositoryURL, boolean isPrivateRepository, String repositoryUsername, String repositoryPassword) @@ -97,7 +97,8 @@ public class CartridgeSubscriptionManager { //validate cartridge alias ApplicationManagementUtil.validateCartridgeAlias(cartridgeAlias, cartridgeType); - Policy autoScalingPolicy; + //TODO - remove, now autoscaling policy is at autoscaler. Just need to pass the name + /*Policy autoScalingPolicy; if(autoscalingPolicyName != null && !autoscalingPolicyName.isEmpty()) { autoScalingPolicy = PolicyHolder.getInstance().getPolicy(autoscalingPolicyName); } else { @@ -106,7 +107,7 @@ public class CartridgeSubscriptionManager { if(autoScalingPolicy == null) { throw new PolicyException("Could not load the auto scaling policy."); - } + } */ CartridgeInfo cartridgeInfo; try { @@ -131,7 +132,7 @@ public class CartridgeSubscriptionManager { Repository repository = cartridgeSubscription.manageRepository(repositoryURL, repositoryUsername, repositoryPassword, isPrivateRepository, cartridgeAlias, cartridgeInfo, tenantDomain); - cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoScalingPolicy, repository); + cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName, deploymentPolicyName, repository); cartridgeSubscription.setSubscriptionKey(generateSubscriptionKey()); // TODO ---- fix properly log.info("Tenant [" + tenantId + "] with username [" + tenantAdminUsername + @@ -424,13 +425,13 @@ public class CartridgeSubscriptionManager { cartridgeSubscription.setClusterSubDomain(cartridgeSubscriptionInfo.getClusterSubdomain()); cartridgeSubscription.setMgtClusterDomain(cartridgeSubscriptionInfo.getMgtClusterDomain()); cartridgeSubscription.setMgtClusterSubDomain(cartridgeSubscriptionInfo.getMgtClusterSubDomain()); - Policy autoScalingPolicy; + /*Policy autoScalingPolicy; if(cartridgeSubscriptionInfo.getPolicy() != null && !cartridgeSubscriptionInfo.getPolicy().isEmpty()) { autoScalingPolicy = PolicyHolder.getInstance().getPolicy(cartridgeSubscriptionInfo.getPolicy()); } else { autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy(); - } - cartridgeSubscription.setAutoscalingPolicy(autoScalingPolicy); + }*/ + cartridgeSubscription.setAutoscalingPolicyName(cartridgeSubscriptionInfo.getPolicy()); Subscriber subscriber = new Subscriber(CarbonContext.getThreadLocalCarbonContext().getUsername(), cartridgeSubscriptionInfo.getTenantId(), cartridgeSubscriptionInfo.getTenantDomain()); cartridgeSubscription.setSubscriber(subscriber); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java index 5ee8c29..951ca66 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/NonCarbonPayload.java @@ -19,12 +19,9 @@ package org.apache.stratos.adc.mgt.payload; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; -import java.text.DecimalFormat; - public class NonCarbonPayload extends Payload { public NonCarbonPayload(String payloadFilePath) { @@ -59,10 +56,11 @@ public class NonCarbonPayload extends Payload { payloadBuilder.append(","); payloadBuilder.append("BAM_PORT=" + System.getProperty(CartridgeConstants.BAM_PORT)); + //TODO: remove //Autoscale policy specific - if(payloadArg.getPolicy() != null) { + /*if(payloadArg.getPolicy() != null) { payloadBuilder.append(getAutoscalingParams(payloadArg.getPolicy())); - } + }*/ } @@ -99,7 +97,8 @@ public class NonCarbonPayload extends Payload { return gitRepoURL; } - private String getAutoscalingParams (Policy policy) { + //TODO: remove + /*private String getAutoscalingParams (Policy policy) { DecimalFormat df = new DecimalFormat("##.##"); df.setParseBigDecimal(true); @@ -122,5 +121,5 @@ public class NonCarbonPayload extends Payload { autoscalingPayloadBuilder.append("SCALE_DOWN_FACTOR=" + policy.getScaleDownFactor()); return autoscalingPayloadBuilder.toString(); - } + }*/ } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java index b672332..d8981e5 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/persistence/DatabaseBasedPersistenceManager.java @@ -24,17 +24,14 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.adc.mgt.client.CloudControllerServiceClient; import org.apache.stratos.adc.mgt.dao.Cluster; import org.apache.stratos.adc.mgt.dao.DataCartridge; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.exception.ADCException; import org.apache.stratos.adc.mgt.exception.PersistenceManagerException; import org.apache.stratos.adc.mgt.repository.Repository; import org.apache.stratos.adc.mgt.subscriber.Subscriber; import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription; import org.apache.stratos.adc.mgt.subscription.DataCartridgeSubscription; -//import org.apache.stratos.adc.mgt.subscription.SingleTenantCartridgeSubscription; import org.apache.stratos.adc.mgt.subscription.factory.CartridgeSubscriptionFactory; import org.apache.stratos.adc.mgt.utils.CartridgeConstants; -import org.apache.stratos.adc.mgt.utils.PolicyHolder; import org.apache.stratos.adc.mgt.utils.RepoPasswordMgtUtil; import org.apache.stratos.adc.mgt.utils.StratosDBUtils; import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; @@ -44,6 +41,8 @@ import java.sql.*; import java.util.ArrayList; import java.util.List; +//import org.apache.stratos.adc.mgt.subscription.SingleTenantCartridgeSubscription; + public class DatabaseBasedPersistenceManager extends PersistenceManager { private static final Log log = LogFactory.getLog(DatabaseBasedPersistenceManager.class); @@ -102,7 +101,7 @@ public class DatabaseBasedPersistenceManager extends PersistenceManager { persistSubscriptionStmt.setString(4, cartridgeSubscription.getSubscriptionStatus()); persistSubscriptionStmt.setBoolean(5, cartridgeSubscription.getCartridgeInfo().getMultiTenant()); persistSubscriptionStmt.setString(6, cartridgeSubscription.getCartridgeInfo().getProvider()); - persistSubscriptionStmt.setString(7, cartridgeSubscription.getAutoscalingPolicy().getName()); + persistSubscriptionStmt.setString(7, cartridgeSubscription.getAutoscalingPolicyName()); persistSubscriptionStmt.setString(8, cartridgeSubscription.getHostName()); persistSubscriptionStmt.setString(9, cartridgeSubscription.getClusterDomain()); persistSubscriptionStmt.setString(10, cartridgeSubscription.getClusterSubDomain()); @@ -486,11 +485,11 @@ public class DatabaseBasedPersistenceManager extends PersistenceManager { throw new PersistenceManagerException(e); } - Policy autoScalingPolicy = PolicyHolder.getInstance().getPolicy(resultSet.getString("AUTOSCALING_POLICY")); + /*Policy autoScalingPolicy = PolicyHolder.getInstance().getPolicy(resultSet.getString("AUTOSCALING_POLICY")); if(autoScalingPolicy == null) { //get the default AutoScaling policy autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy(); - } + }*/ //populate data cartridgeSubscription.setSubscriptionId(resultSet.getInt("SUBSCRIPTION_ID")); @@ -498,7 +497,7 @@ public class DatabaseBasedPersistenceManager extends PersistenceManager { cartridgeSubscription.setAlias(resultSet.getString("CARTRIDGE_ALIAS")); cartridgeSubscription.setMappedDomain(resultSet.getString("MAPPED_DOMAIN")); cartridgeSubscription.setSubscriptionStatus(resultSet.getString("SUBSCRIPTION_STATUS")); - cartridgeSubscription.setAutoscalingPolicy(autoScalingPolicy); + cartridgeSubscription.setAutoscalingPolicyName(resultSet.getString("AUTOSCALING_POLICY")); //Repository related data if (resultSet.getInt("REPOSITORY_ID") != -1) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java index 0eb2c28..8ea7326 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/service/ApplicationManagementService.java @@ -393,7 +393,7 @@ public class ApplicationManagementService extends AbstractAdmin { // ApplicationManagementUtil.getTenantId(getConfigContext()), getTenantDomain()); CartridgeSubscription cartridgeSubscription = cartridgeSubsciptionManager.subscribeToCartridge(cartridgeType, - alias.trim(), policy, getTenantDomain(), ApplicationManagementUtil.getTenantId(configurationContext), + alias.trim(), "economyPolicy", "economy-deployment", getTenantDomain(), ApplicationManagementUtil.getTenantId(configurationContext), getUsername(), "git", repoURL, privateRepo, repoUsername, repoPassword); if(dataCartridgeAlias != null && !dataCartridgeAlias.trim().isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java index 63fc6b1..8ed62c6 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/ApplicationCartridgeSubscription.java @@ -20,7 +20,6 @@ package org.apache.stratos.adc.mgt.subscription; import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.exception.*; import org.apache.stratos.adc.mgt.payload.PayloadArg; import org.apache.stratos.adc.mgt.repository.Repository; @@ -42,13 +41,13 @@ public class ApplicationCartridgeSubscription extends CartridgeSubscription { super(cartridgeInfo); } - public void createSubscription(Subscriber subscriber, String alias, Policy autoscalingPolicy, - Repository repository) throws + public void createSubscription(Subscriber subscriber, String alias, String autoscalingPolicyName, + String deploymentPolicyName, Repository repository) throws InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException, RepositoryCredentialsRequiredException, RepositoryTransportException, UnregisteredCartridgeException, AlreadySubscribedException, RepositoryRequiredException, InvalidRepositoryException, PolicyException { - super.createSubscription(subscriber, alias, autoscalingPolicy, repository); + super.createSubscription(subscriber, alias, autoscalingPolicyName, deploymentPolicyName, repository); subscriptionTenancyBehaviour.createSubscription(); } @@ -57,7 +56,7 @@ public class ApplicationCartridgeSubscription extends CartridgeSubscription { subscriptionTenancyBehaviour.registerSubscription(null); - return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), + return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(), getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING", getSubscriptionKey()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java index 76f0739..567ffb7 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java @@ -25,7 +25,6 @@ import org.apache.stratos.adc.mgt.custom.domain.RegistryManager; import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo; import org.apache.stratos.adc.mgt.dao.Cluster; import org.apache.stratos.adc.mgt.dns.DNSManager; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.exception.*; import org.apache.stratos.adc.mgt.internal.DataHolder; import org.apache.stratos.adc.mgt.payload.Payload; @@ -50,7 +49,8 @@ public abstract class CartridgeSubscription { private int subscriptionId; private String type; private String alias; - private Policy autoscalingPolicy; + private String autoscalingPolicyName; + private String deploymentPolicyName; private Subscriber subscriber; private Repository repository; private CartridgeInfo cartridgeInfo; @@ -93,6 +93,7 @@ public abstract class CartridgeSubscription { * @param subscriber Subscriber subscription * @param alias Alias of the cartridge subscription * @param autoscalingPolicy Auto scaling policy + * @param deploymentPolicyName Deployment policy * @param repository Relevenat Repository subscription * * @throws org.apache.stratos.adc.mgt.exception.ADCException @@ -106,15 +107,16 @@ public abstract class CartridgeSubscription { * @throws org.apache.stratos.adc.mgt.exception.InvalidRepositoryException * @throws org.apache.stratos.adc.mgt.exception.RepositoryTransportException */ - public void createSubscription (Subscriber subscriber, String alias, Policy autoscalingPolicy, - Repository repository) + public void createSubscription (Subscriber subscriber, String alias, String autoscalingPolicy, + String deploymentPolicyName, Repository repository) throws ADCException, PolicyException, UnregisteredCartridgeException, InvalidCartridgeAliasException, DuplicateCartridgeAliasException, RepositoryRequiredException, AlreadySubscribedException, RepositoryCredentialsRequiredException, InvalidRepositoryException, RepositoryTransportException { setSubscriber(subscriber); setAlias(alias); - setAutoscalingPolicy(autoscalingPolicy); + setAutoscalingPolicyName(autoscalingPolicy); + setDeploymentPolicyName(deploymentPolicyName); setRepository(repository); } @@ -166,7 +168,7 @@ public abstract class CartridgeSubscription { PayloadArg payloadArg = new PayloadArg(); payloadArg.setCartridgeInfo(getCartridgeInfo()); - payloadArg.setPolicy(getAutoscalingPolicy()); + //payloadArg.setPolicy(getAutoscalingPolicyName()); payloadArg.setMultitenant(getCartridgeInfo().getMultiTenant()); payloadArg.setTenantId(getSubscriber().getTenantId()); payloadArg.setTenantDomain(getSubscriber().getTenantDomain()); @@ -370,12 +372,12 @@ public abstract class CartridgeSubscription { getCluster().setHostName(hostName); } - public Policy getAutoscalingPolicy() { - return autoscalingPolicy; + public String getAutoscalingPolicyName() { + return autoscalingPolicyName; } - public void setAutoscalingPolicy(Policy autoscalingPolicy) { - this.autoscalingPolicy = autoscalingPolicy; + public void setAutoscalingPolicyName(String autoscalingPolicyName) { + this.autoscalingPolicyName = autoscalingPolicyName; } public void setSubscriber(Subscriber subscriber) { @@ -438,4 +440,11 @@ public abstract class CartridgeSubscription { this.cluster = cluster; } + public String getDeploymentPolicyName() { + return deploymentPolicyName; + } + + public void setDeploymentPolicyName(String deploymentPolicyName) { + this.deploymentPolicyName = deploymentPolicyName; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription_old.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription_old.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription_old.java index cab956d..b6b0deb 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription_old.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription_old.java @@ -104,7 +104,7 @@ // // setSubscriber(subscriber); // setAlias(alias); -// setAutoscalingPolicy(autoscalingPolicy); +// setAutoscalingPolicyName(autoscalingPolicy); // setRepository(repository); // } // @@ -156,7 +156,7 @@ // // PayloadArg payloadArg = new PayloadArg(); // payloadArg.setCartridgeInfo(getCartridgeInfo()); -// payloadArg.setPolicy(getAutoscalingPolicy()); +// payloadArg.setPolicy(getAutoscalingPolicyName()); // payloadArg.setMultitenant(getCartridgeInfo().getMultiTenant()); // payloadArg.setTenantId(getSubscriber().getTenantId()); // payloadArg.setTenantDomain(getSubscriber().getTenantDomain()); @@ -360,11 +360,11 @@ // getCluster().setHostName(hostName); // } // -// public Policy getAutoscalingPolicy() { +// public Policy getAutoscalingPolicyName() { // return autoscalingPolicy; // } // -// public void setAutoscalingPolicy(Policy autoscalingPolicy) { +// public void setAutoscalingPolicyName(Policy autoscalingPolicy) { // this.autoscalingPolicy = autoscalingPolicy; // } // http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java index 979d467..5ec5fd3 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription.java @@ -21,7 +21,6 @@ package org.apache.stratos.adc.mgt.subscription; import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo; import org.apache.stratos.adc.mgt.dao.DataCartridge; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.exception.*; import org.apache.stratos.adc.mgt.payload.PayloadArg; import org.apache.stratos.adc.mgt.repository.Repository; @@ -52,14 +51,15 @@ public class DataCartridgeSubscription extends CartridgeSubscription { } @Override - public void createSubscription(Subscriber subscriber, String alias, Policy autoscalingPolicy, Repository repository) + public void createSubscription(Subscriber subscriber, String alias, String autoscalingPolicyName, String deploymentPolicyName, + Repository repository) throws InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException, RepositoryCredentialsRequiredException, RepositoryTransportException, UnregisteredCartridgeException, AlreadySubscribedException, RepositoryRequiredException, InvalidRepositoryException, PolicyException { - super.createSubscription(subscriber, alias, autoscalingPolicy, repository); + super.createSubscription(subscriber, alias, autoscalingPolicyName, deploymentPolicyName, repository); subscriptionTenancyBehaviour.createSubscription(); } @@ -77,15 +77,16 @@ public class DataCartridgeSubscription extends CartridgeSubscription { public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException, UnregisteredCartridgeException { - subscriptionTenancyBehaviour.registerSubscription(ApplicationManagementUtil. - setRegisterServiceProperties(getAutoscalingPolicy(), getSubscriber().getTenantId(), getAlias())); + //subscriptionTenancyBehaviour.registerSubscription(ApplicationManagementUtil. + // setRegisterServiceProperties(getAutoscalingPolicyName(), getSubscriber().getTenantId(), getAlias())); + subscriptionTenancyBehaviour.registerSubscription(null); DataCartridge dataCartridge = new DataCartridge(); dataCartridge.setUserName(getUsername()); dataCartridge.setPassword(getPassword()); dataCartridge.setDataCartridgeType(getType()); - return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), + return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(), getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), dataCartridge, "PENDING",getSubscriptionKey()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java index 2faa986..cd5f4dc 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/DataCartridgeSubscription_old.java @@ -84,7 +84,7 @@ // getPayload().createPayload(), // getPayload().getPayloadArg().getTenantRange(), // getCluster().getHostName(), -// ApplicationManagementUtil.setRegisterServiceProperties(getAutoscalingPolicy(), +// ApplicationManagementUtil.setRegisterServiceProperties(getAutoscalingPolicyName(), // getSubscriber().getTenantId(), getAlias())); // // getPayload().delete(); @@ -94,7 +94,7 @@ // dataCartridge.setPassword(getPassword()); // dataCartridge.setDataCartridgeType(getType()); // -// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), +// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(), // getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), // getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), // getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), dataCartridge, "PENDING",getSubscriptionKey()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java index c5365ad..640aa9f 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/FrameworkCartridgeSubscription.java @@ -20,7 +20,6 @@ package org.apache.stratos.adc.mgt.subscription; import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo; -import org.apache.stratos.adc.mgt.dto.Policy; import org.apache.stratos.adc.mgt.exception.*; import org.apache.stratos.adc.mgt.payload.PayloadArg; import org.apache.stratos.adc.mgt.repository.Repository; @@ -42,13 +41,13 @@ public class FrameworkCartridgeSubscription extends CartridgeSubscription { } @Override - public void createSubscription(Subscriber subscriber, String alias, Policy autoscalingPolicy, - Repository repository) throws + public void createSubscription(Subscriber subscriber, String alias, String autoscalingPolicyName, + String deploymentPolicyName, Repository repository) throws InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException, RepositoryCredentialsRequiredException, RepositoryTransportException, UnregisteredCartridgeException, AlreadySubscribedException, RepositoryRequiredException, InvalidRepositoryException, PolicyException { - super.createSubscription(subscriber, alias, autoscalingPolicy, repository); + super.createSubscription(subscriber, alias, autoscalingPolicyName, deploymentPolicyName, repository); subscriptionTenancyBehaviour.createSubscription(); } @@ -57,7 +56,7 @@ public class FrameworkCartridgeSubscription extends CartridgeSubscription { subscriptionTenancyBehaviour.registerSubscription(null); - return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), + return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(), getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING", getSubscriptionKey()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java index de9fbcf..ca20235 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/MultiTenantCartridgeSubscription.java @@ -119,7 +119,7 @@ // @Override // public CartridgeSubscriptionInfo registerSubscription(Properties properties) { // -// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), +// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(), // getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), // getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), // getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java index f837fbd..6137c70 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/SingleTenantCartridgeSubscription.java @@ -70,7 +70,7 @@ // // getPayload().delete(); // -// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicy(), +// return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(), // getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(), // getRepository(), getCluster().getHostName(), getCluster().getClusterDomain(), getCluster().getClusterSubDomain(), // getCluster().getMgtClusterDomain(), getCluster().getMgtClusterSubDomain(), null, "PENDING",getSubscriptionKey()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java index 4f185c1..8d76aeb 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/tenancy/SubscriptionSingleTenantBehaviour.java @@ -59,6 +59,8 @@ public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehavi cartridgeSubscription.getPayload().createPayload(), cartridgeSubscription.getPayload().getPayloadArg().getTenantRange(), cartridgeSubscription.getCluster().getHostName(), + cartridgeSubscription.getAutoscalingPolicyName(), + cartridgeSubscription.getDeploymentPolicyName(), properties); cartridgeSubscription.getPayload().delete(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java index 55ba560..38513d1 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java @@ -540,7 +540,7 @@ public class ApplicationManagementUtil { } public static CartridgeSubscriptionInfo createCartridgeSubscription(CartridgeInfo cartridgeInfo, - Policy policy, + String policyName, String cartridgeType, String cartridgeName, int tenantId, @@ -563,7 +563,7 @@ public class ApplicationManagementUtil { cartridgeSubscriptionInfo.setMgtClusterDomain(mgtClusterDomain); cartridgeSubscriptionInfo.setMgtClusterSubDomain(mgtClusterSubDomain); cartridgeSubscriptionInfo.setHostName(hostName); - cartridgeSubscriptionInfo.setPolicy(policy.getName()); + cartridgeSubscriptionInfo.setPolicy(policyName); cartridgeSubscriptionInfo.setRepository(repository); cartridgeSubscriptionInfo.setPortMappings(createPortMappings(cartridgeInfo)); cartridgeSubscriptionInfo.setProvider(cartridgeInfo.getProvider()); @@ -940,12 +940,14 @@ public class ApplicationManagementUtil { } public static void registerService(String cartridgeType, String domain, String subDomain, - StringBuilder payload, String tenantRange, String hostName, Properties properties) + StringBuilder payload, String tenantRange, String hostName, + String autoscalingPoliyName, String deploymentPolicyName, + Properties properties) throws ADCException, UnregisteredCartridgeException { log.info("Register service.."); try { CloudControllerServiceClient.getServiceClient().register(domain, cartridgeType, payload.toString(), tenantRange, - hostName, properties, "economyPolicy"); + hostName, properties, autoscalingPoliyName, deploymentPolicyName); } catch (CloudControllerServiceIllegalArgumentExceptionException e) { String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage(); log.error(msg, e); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java index 4ef14cc..40acbf7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java @@ -32,6 +32,7 @@ public class Registrant { private String payload; private Properties properties; private String autoScalerPolicyName; + private String deploymentPolicyName; public String getTenantRange() { return tenantRange; @@ -75,5 +76,12 @@ public class Registrant { public void setPayload(String payload) { this.payload = payload; } - + + public String getDeploymentPolicyName() { + return deploymentPolicyName; + } + + public void setDeploymentPolicyName(String deploymentPolicyName) { + this.deploymentPolicyName = deploymentPolicyName; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f163f22f/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl index 0267908..3db07e6 100644 --- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl +++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl @@ -246,6 +246,7 @@ <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> + <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="properties" nillable="true" type="ax26:Properties"/> @@ -819,22 +820,22 @@ </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="http://10.100.1.154:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> + <soap:address location="http://10.144.132.229:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding"> - <soap:address location="https://10.100.1.154:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/> + <soap:address location="https://10.144.132.229:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="http://10.100.1.154:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/> + <soap12:address location="http://10.144.132.229:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding"> - <soap12:address location="https://10.100.1.154:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/> + <soap12:address location="https://10.144.132.229:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="http://10.100.1.154:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/> + <http:address location="http://10.144.132.229:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/> </wsdl:port> <wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding"> - <http:address location="https://10.100.1.154:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> + <http:address location="https://10.144.132.229:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file
