You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/11/02 16:31:19 UTC
[38/50] [abbrv] stratos git commit: Revert "Merge with
tenant-isolation branch"
Revert "Merge with tenant-isolation branch"
This reverts commit 2c34f816cfbd5a93c62ecc4dffe1d87026e7c329, reversing
changes made to eefef717ba6853b5ed67bafcfddda250e2802cba.
Conflicts:
components/org.apache.stratos.python.cartridge.agent/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonCartridgeAgentTest.java
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java
products/stratos/modules/integration/src/test/resources/stratos-testing.xml
samples/cartridges/kubernetes/php.json
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4b864473
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4b864473
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4b864473
Branch: refs/heads/master
Commit: 4b864473e60325694fd2e0b52fe3d1d57a33e536
Parents: bc56b3d
Author: gayangunarathne <ga...@wso2.com>
Authored: Mon Nov 2 17:08:03 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Mon Nov 2 17:08:03 2015 +0530
----------------------------------------------------------------------
.../networkpartition/AllAtOnceAlgorithm.java | 4 +-
.../OneAfterAnotherAlgorithm.java | 8 +-
.../applications/ApplicationUtils.java | 6 +-
.../applications/ClusterInformation.java | 4 +-
.../applications/MTClusterInformation.java | 8 +-
.../applications/STClusterInformation.java | 8 +-
.../dependency/DependencyBuilder.java | 1 +
.../context/ApplicationChildContextFactory.java | 1 -
.../dependency/context/ClusterChildContext.java | 9 -
.../parser/DefaultApplicationParser.java | 157 +-
.../applications/parser/ParserUtils.java | 2 +-
.../applications/payload/BasicPayloadData.java | 11 -
.../pojo/ApplicationClusterContext.java | 18 +-
.../applications/pojo/ApplicationContext.java | 23 +-
.../applications/pojo/CartridgeContext.java | 27 +-
.../applications/pojo/GroupContext.java | 28 -
.../pojo/SubscribableInfoContext.java | 40 +-
.../applications/topic/ApplicationBuilder.java | 52 +-
.../client/AutoscalerCloudControllerClient.java | 57 +-
.../autoscaler/context/AutoscalerContext.java | 17 +-
.../context/cluster/ClusterContext.java | 30 +-
.../context/cluster/ClusterContextFactory.java | 2 +
.../context/partition/PartitionContext.java | 2 +-
.../AutoscalerTopologyEventReceiver.java | 85 +-
.../internal/AutoscalerServiceComponent.java | 8 +-
.../autoscaler/monitor/MonitorFactory.java | 20 +-
.../monitor/cluster/ClusterMonitor.java | 209 +--
.../monitor/component/ApplicationMonitor.java | 141 +-
.../monitor/component/GroupMonitor.java | 24 +-
.../component/ParentComponentMonitor.java | 2 +-
.../stratos/autoscaler/pojo/ServiceGroup.java | 30 +-
.../autoscaler/pojo/policy/PolicyManager.java | 266 +--
.../pojo/policy/autoscale/AutoscalePolicy.java | 24 +-
.../policy/deployment/ApplicationPolicy.java | 27 -
.../policy/deployment/DeploymentPolicy.java | 35 +-
.../autoscaler/registry/RegistryManager.java | 62 +-
.../autoscaler/rule/RuleTasksDelegator.java | 44 +-
.../autoscaler/services/AutoscalerService.java | 107 +-
.../services/impl/AutoscalerServiceImpl.java | 703 ++------
.../group/GroupStatusInactiveProcessor.java | 2 +-
.../processor/group/GroupStatusProcessor.java | 2 +-
.../util/AutoscalerObjectConverter.java | 7 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 209 +--
.../stratos/autoscaler/AutoscalerUtilTest.java | 64 +
.../publisher/HealthStatisticsNotifier.java | 10 +-
.../agent/test/JavaCartridgeAgentTest.java | 9 +-
.../concurrent/PartitionValidatorCallable.java | 2 +-
.../context/CloudControllerContext.java | 82 +-
.../domain/ApplicationClusterContext.java | 14 +-
.../cloud/controller/domain/Cartridge.java | 18 -
.../cloud/controller/domain/ClusterContext.java | 18 +-
.../controller/domain/NetworkPartition.java | 38 +-
.../cloud/controller/domain/Partition.java | 36 +-
.../domain/kubernetes/KubernetesCluster.java | 36 +-
.../CloudStackPartitionValidator.java | 2 +-
.../iaases/ec2/EC2PartitionValidator.java | 4 +-
.../iaases/kubernetes/KubernetesIaas.java | 38 +-
.../KubernetesPartitionValidator.java | 4 +-
.../cloud/controller/iaases/mock/MockIaas.java | 2 +-
.../openstack/OpenstackPartitionValidator.java | 4 +-
.../publisher/TopologyEventPublisher.java | 20 +-
.../messaging/topology/TopologyBuilder.java | 1457 ++++++++--------
.../services/CloudControllerService.java | 66 +-
.../impl/CloudControllerServiceImpl.java | 512 ++----
.../impl/CloudControllerServiceUtil.java | 19 +-
.../services/impl/InstanceCreator.java | 17 +-
.../publisher/BAMUsageDataPublisher.java | 44 +-
.../util/CloudControllerConstants.java | 4 -
.../controller/util/CloudControllerUtil.java | 12 +-
.../beans/application/ApplicationBean.java | 5 +-
.../beans/application/SubscribableInfo.java | 12 +-
.../beans/cartridge/CartridgeGroupBean.java | 18 +-
.../cartridge/CartridgeGroupReferenceBean.java | 19 +-
.../beans/cartridge/CartridgeReferenceBean.java | 18 -
.../beans/kubernetes/KubernetesClusterBean.java | 18 +-
.../beans/partition/NetworkPartitionBean.java | 1 +
.../common/beans/partition/PartitionBean.java | 19 +-
.../beans/partition/PartitionReferenceBean.java | 19 +-
.../deployment/ApplicationPolicyBean.java | 9 -
.../beans/topology/ApplicationInstanceBean.java | 19 +-
.../common/client/AutoscalerServiceClient.java | 81 +-
.../client/CloudControllerServiceClient.java | 68 +-
.../client/StratosManagerServiceClient.java | 20 +-
.../common/constants/StratosConstants.java | 8 +-
.../common/partition/NetworkPartitionRef.java | 11 +-
.../stratos/common/partition/PartitionRef.java | 37 +-
.../publisher/HealthStatisticsPublisher.java | 3 +-
.../publisher/InFlightRequestPublisher.java | 4 +-
.../publisher/StatisticsPublisherType.java | 2 +-
.../publisher/ThriftClientConfig.java | 101 --
.../publisher/ThriftClientConfigParser.java | 173 --
.../statistics/publisher/ThriftClientInfo.java | 71 -
.../publisher/ThriftStatisticsPublisher.java | 116 --
.../publisher/wso2/cep/ThriftClientConfig.java | 81 +
.../wso2/cep/ThriftClientConfigParser.java | 139 ++
.../publisher/wso2/cep/ThriftClientInfo.java | 63 +
.../cep/WSO2CEPHealthStatisticsPublisher.java | 29 +-
.../cep/WSO2CEPInFlightRequestPublisher.java | 28 +-
.../wso2/cep/WSO2CEPStatisticsPublisher.java | 114 ++
.../common/threading/StratosThreadPool.java | 21 +-
.../test/ThriftClientConfigParserTest.java | 23 +-
.../src/test/resources/thrift-client-config.xml | 22 +-
.../KubernetesAPIClientInterface.java | 13 +-
...LoadBalancerCommonTopologyEventReceiver.java | 2 +-
.../LoadBalancerStatisticsNotifier.java | 3 +-
.../schema/configure/application-policies.json | 4 +-
.../schema/configure/autoscaling-policies.json | 2 +-
.../schema/configure/deployment-policies.json | 2 +-
.../schema/configure/network-partitions.json | 2 +-
.../themes/theme0/partials/configure_form.hbs | 4 -
components/org.apache.stratos.manager/pom.xml | 1 -
.../manager/context/StratosManagerContext.java | 148 +-
.../manager/services/StratosManagerService.java | 42 +-
.../impl/StratosManagerServiceImpl.java | 44 +-
.../domain/application/Application.java | 26 +-
.../domain/application/Applications.java | 18 +-
.../domain/application/ClusterDataHolder.java | 15 +-
.../domain/application/ParentComponent.java | 4 +-
.../messaging/domain/instance/Instance.java | 10 +-
.../messaging/domain/topology/Service.java | 12 +-
.../messaging/domain/topology/Topology.java | 20 +-
.../topology/locking/TopologyLockHierarchy.java | 8 +-
.../topology/ClusterInstanceCreatedEvent.java | 12 +-
.../event/topology/ServiceCreatedEvent.java | 8 +-
.../event/topology/ServiceRemovedEvent.java | 18 +-
...licationInstanceCreatedMessageProcessor.java | 44 +-
...licationClustersCreatedMessageProcessor.java | 21 +-
.../ClusterInstanceCreatedMessageProcessor.java | 14 +-
.../ServiceCreatedMessageProcessor.java | 4 +-
.../ServiceRemovedMessageProcessor.java | 8 +-
.../topology/updater/TopologyUpdater.java | 10 +-
.../publisher/MockHealthStatisticsNotifier.java | 3 -
.../test/PythonCartridgeAgentTest.java | 529 ++++++
.../rest/endpoint/api/StratosApiV40Utils.java | 7 +-
.../rest/endpoint/api/StratosApiV41.java | 302 ++--
.../rest/endpoint/api/StratosApiV41Utils.java | 1277 ++++++--------
.../util/converter/ObjectConverter.java | 363 ++--
dependencies/fabric8/pom.xml | 2 +-
.../streamdefinitions/stream-manager-config.xml | 486 +++---
extensions/das/README.md | 10 -
.../CloudControllerEventReceiver.xml | 29 -
.../eventreceivers/HealthStatsEventReceiver.xml | 29 -
.../eventreceivers/RIFEventReceiver.xml | 29 -
.../eventsink/cartridge_agent_health_stats.xml | 85 -
.../artifacts/eventsink/in_flight_requests.xml | 64 -
.../org_apache_stratos_cloud_controller.xml | 211 ---
.../cartridge_agent_health_stats_1.0.0.json | 40 -
.../eventstreams/in_flight_requests_1.0.0.json | 28 -
...g.apache.stratos.cloud.controller_1.0.0.json | 112 --
extensions/das/artifacts/sparkscript/CCEvent | 18 -
extensions/das/pom.xml | 40 -
extensions/das/spark-udf/pom.xml | 36 -
.../das/extension/spark/udf/TimeUDF.java | 49 -
.../pom.xml | 3 +-
.../src/main/conf/drools/dependent-scaling.drl | 11 +-
.../src/main/conf/drools/mincheck.drl | 22 +-
.../src/main/conf/drools/scaling.drl | 17 +-
.../src/main/conf/thrift-client-config.xml | 22 +-
.../integration/tests/RestConstants.java | 8 -
.../tests/StratosTestServerManager.java | 155 +-
.../integration/tests/TopologyHandler.java | 88 +-
.../application/ApplicationBurstingTest.java | 189 +-
.../application/ApplicationUpdateTest.java | 312 ++--
.../application/GroupStartupOrderTest.java | 358 ++--
.../GroupTerminationBehaviorTest.java | 111 +-
.../PartitionOneAfterAnotherClusterTest.java | 56 +-
.../PartitionRoundRobinClusterTest.java | 90 +-
.../application/SampleApplicationsTest.java | 233 ++-
.../application/SingleClusterScalingTest.java | 196 ++-
.../tests/group/CartridgeGroupTest.java | 226 ++-
.../integration/tests/group/CartridgeTest.java | 138 +-
.../tests/policies/ApplicationPolicyTest.java | 179 +-
.../tests/policies/AutoscalingPolicyTest.java | 146 +-
.../tests/policies/DeploymentPolicyTest.java | 199 ++-
.../tests/policies/NetworkPartitionTest.java | 108 +-
.../tests/rest/IntegrationMockClient.java | 2 +-
.../integration/tests/rest/RestClient.java | 22 +-
.../integration/tests/users/TenantTest.java | 2 +-
.../integration/tests/users/UserTest.java | 12 +-
.../src/test/resources/common/mock-iaas.xml | 28 +-
...cation-policy-application-bursting-test.json | 18 -
.../app-bursting-single-cartriddge-group.json | 70 -
...caling-policy-application-bursting-test.json | 14 -
...esb-php-group-application-bursting-test.json | 19 -
.../mock/esb-application-bursting-test.json | 50 -
.../mock/php-application-bursting-test.json | 51 -
.../mock/tomcat-application-bursting-test.json | 53 -
...oyment-policy-application-bursting-test.json | 32 -
...k-partition-application-bursting-test-1.json | 15 -
...k-partition-application-bursting-test-2.json | 24 -
.../RegionOne.json | 17 -
.../application-martin.json | 100 --
.../application-policy-1.json | 17 -
.../application-s-g-c1-c2-c3-s.json | 130 --
.../application.json | 108 --
.../startup-order-termination-behavior/c1.json | 45 -
.../startup-order-termination-behavior/c2.json | 45 -
.../startup-order-termination-behavior/c3.json | 45 -
.../startup-order-termination-behavior/c4.json | 45 -
.../startup-order-termination-behavior/c5.json | 132 --
.../cartridge-groups-s-g-c1-c2-c3-s.json | 26 -
.../cartridge-groups-working.json | 34 -
.../cartridge-groups.json | 77 -
.../cartridge-groups.json.back | 53 -
.../deploy.sh | 43 -
.../economy-policy.json | 15 -
.../static-1.json | 17 -
.../wso2carbon 2.log | 992 -----------
.../wso2carbon-working 2.log | 1053 -----------
.../wso2carbon-working.log | 1053 -----------
.../wso2carbon.log | 992 -----------
.../single-cluster-scaling-test.json | 2 +-
.../src/test/resources/stratos-testing.xml | 126 +-
.../src/test/resources/tenant/tenant1.json | 9 -
.../src/test/resources/tenant/tenant2.json | 9 -
.../scripts/common/deploy.sh | 25 +-
.../scripts/common/undeploy.sh | 16 +-
.../scripts/kubernetes/deploy.sh | 8 +-
.../single-cartridge-app/scripts/mock/deploy.sh | 2 +-
.../scripts/mock/undeploy.sh | 2 +-
.../single-group-app/scripts/common/deploy.sh | 29 +-
.../single-group-app/scripts/common/undeploy.sh | 27 +-
.../single-group-app/scripts/mock/deploy.sh | 2 +-
.../single-group-app/scripts/mock/undeploy.sh | 2 +-
samples/cartridges/kubernetes/php.json | 2 +-
.../kubernetes-cluster-1.json | 2 +-
.../kubernetes-cluster-2.json | 2 +-
samples/tenants/tenant1.json | 9 -
samples/tenants/tenant2.json | 9 -
.../src/main/resources/AutoscalerService.wsdl | 1641 +++++-------------
.../main/resources/CloudControllerService.wsdl | 1369 ++++++---------
.../main/resources/StratosManagerService.wsdl | 268 +--
232 files changed, 7120 insertions(+), 15453 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
index 4e52496..3d5dc24 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
@@ -40,7 +40,7 @@ public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm {
return null;
}
- String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid();
+ String[] networkPartitions = applicationPolicy.getNetworkPartitions();
if (networkPartitions == null || networkPartitions.length == 0) {
return null;
}
@@ -61,7 +61,7 @@ public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm {
return null;
}
- String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid();
+ String[] networkPartitions = applicationPolicy.getNetworkPartitions();
if (networkPartitions == null || networkPartitions.length == 0) {
return null;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java
index adcb06c..c9f6970 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java
@@ -68,7 +68,7 @@ public class OneAfterAnotherAlgorithm implements NetworkPartitionAlgorithm {
return null;
}
- String applicationPolicyId = applicationPolicy.getUuid();
+ String applicationPolicyId = applicationPolicy.getId();
String[] networkPartitionGroups = applicationPolicy.getNetworkPartitionGroups();
if (networkPartitionGroups != null && networkPartitionGroups.length != 0) {
if (log.isDebugEnabled()) {
@@ -131,7 +131,7 @@ public class OneAfterAnotherAlgorithm implements NetworkPartitionAlgorithm {
return selectedNetworkPartitions;
}
- String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid();
+ String[] networkPartitions = applicationPolicy.getNetworkPartitions();
if (networkPartitions == null || networkPartitions.length == 0) {
if (log.isWarnEnabled()) {
String msg = String.format("Network partitions found in application policy " +
@@ -223,7 +223,7 @@ public class OneAfterAnotherAlgorithm implements NetworkPartitionAlgorithm {
return null;
}
- String applicationPolicyId = applicationPolicy.getUuid();
+ String applicationPolicyId = applicationPolicy.getId();
String[] networkPartitionGroups = applicationPolicy.getNetworkPartitionGroups();
List<String> selectedNetworkPartitions = new ArrayList<String>();
@@ -248,7 +248,7 @@ public class OneAfterAnotherAlgorithm implements NetworkPartitionAlgorithm {
} else {
//Returning the very first network-partition as the default one
- String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid();
+ String[] networkPartitions = applicationPolicy.getNetworkPartitions();
selectedNetworkPartitions.add(networkPartitions[0]);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
index dbf264e..d43f364 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
@@ -37,12 +37,11 @@ import java.util.Set;
import java.util.regex.Pattern;
public class ApplicationUtils {
- private static final Log log = LogFactory.getLog(ApplicationUtils.class);
-
public static final String TOKEN_PAYLOAD_PARAM_NAME = "TOKEN";
public static final String DEPLOYMENT = "DEPLOYMENT";
private static final String PORT_SEPARATOR="|";
public static final String PAYLOAD_PARAMETER = "payload_parameter.";
+ private static final Log log = LogFactory.getLog(ApplicationUtils.class);
public static Pattern ALIAS_PATTERN = Pattern.compile("([a-z0-9]+([-][a-z0-9])*)+");
public static boolean isAliasValid(String alias) {
@@ -262,8 +261,7 @@ public class ApplicationUtils {
basicPayloadData.setMultitenant(String.valueOf(cartridge.getMultiTenant()));
basicPayloadData.setPorts(createPortsToPayloadString(cartridge));
basicPayloadData.setPortMappings(createPortMappingsToPayloadString(cartridge));
- basicPayloadData.setServiceName(cartridge.getUuid());
- basicPayloadData.setServiceType(cartridge.getType());
+ basicPayloadData.setServiceName(cartridge.getType());
basicPayloadData.setProvider(cartridge.getProvider());
basicPayloadData.setLvsVirtualIP(lvsVirtualIP);
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
index 8c4d1b0..ae3b0d3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
@@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.applications;
public interface ClusterInformation {
- public String getClusterId(String applicationUuid, String alias, String cartridgeType);
+ public String getClusterId(String applicationId, String alias, String cartridgeType);
- public String getHostName(String applicationUuid, String alias, String cartridgeDefinitionHostName);
+ public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
index 90c8e50..598d17b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
@@ -22,24 +22,24 @@ package org.apache.stratos.autoscaler.applications;
public class MTClusterInformation implements ClusterInformation {
@Override
- public String getClusterId(String applicationUuid, String alias, String cartridgeType) {
+ public String getClusterId(String applicationId, String alias, String cartridgeType) {
if (!ApplicationUtils.isValid(cartridgeType)) {
// cannot happen
throw new IllegalArgumentException("Invalid cartridge type value provided: [ " + cartridgeType + " ]");
}
- return applicationUuid + "." + alias + "." + cartridgeType + ".domain";
+ return applicationId + "." + alias + "." + cartridgeType + ".domain";
}
@Override
- public String getHostName(String applicationUuid, String alias, String cartridgeDefinitionHostName) {
+ public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName) {
if (!ApplicationUtils.isValid(cartridgeDefinitionHostName)) {
// cannot happen
throw new IllegalArgumentException("Invalid host name value provided: [ " + cartridgeDefinitionHostName + " ]");
}
- return applicationUuid + "." + cartridgeDefinitionHostName;
+ return applicationId + "." + cartridgeDefinitionHostName;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
index 76cd9a9..1ed3e2f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
@@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.applications;
public class STClusterInformation implements ClusterInformation {
@Override
- public String getClusterId(String applicationUuid, String alias, String cartridgeType) {
+ public String getClusterId(String applicationId, String alias, String cartridgeType) {
if (!ApplicationUtils.isValid(alias)) {
// cannot happen
@@ -34,11 +34,11 @@ public class STClusterInformation implements ClusterInformation {
throw new IllegalArgumentException("Invalid cartridge type value provided: [ " + cartridgeType + " ]");
}
- return applicationUuid + "." + alias + "." + cartridgeType + ".domain";
+ return applicationId + "." + alias + "." + cartridgeType + ".domain";
}
@Override
- public String getHostName(String applicationUuid, String alias, String cartridgeDefinitionHostName) {
+ public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName) {
if (!ApplicationUtils.isValid(alias)) {
// cannot happen
@@ -50,6 +50,6 @@ public class STClusterInformation implements ClusterInformation {
throw new IllegalArgumentException("Invalid host name value provided: [ " + cartridgeDefinitionHostName + " ]");
}
- return applicationUuid + "." + alias + "." + cartridgeDefinitionHostName;
+ return applicationId + "." + alias + "." + cartridgeDefinitionHostName;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
index 8e17c53..fe5ae12 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java
@@ -90,6 +90,7 @@ public class DependencyBuilder {
log.info(String.format("Termination behaviour set: [component] %s [termination-behaviour] %s",
identifier, dependencyTree.getTerminationBehavior()));
+
Set<StartupOrder> startupOrders = dependencyOrder.getStartupOrders();
ApplicationChildContext parentContext;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java
index 3f14e5c..0c8fe9f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java
@@ -71,7 +71,6 @@ public class ApplicationChildContextFactory {
boolean isKillDependent) {
ClusterChildContext clusterChildContext = new ClusterChildContext(dataHolder.getClusterId(), isKillDependent);
clusterChildContext.setServiceName(dataHolder.getServiceType());
- clusterChildContext.setServiceUuid(dataHolder.getServiceUuid());
return clusterChildContext;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java
index a4464ff..19f3135 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java
@@ -23,7 +23,6 @@ package org.apache.stratos.autoscaler.applications.dependency.context;
*/
public class ClusterChildContext extends ApplicationChildContext {
private String serviceName;
- private String serviceUuid;
public ClusterChildContext(String id, boolean killDependent) {
super(id, killDependent);
@@ -36,12 +35,4 @@ public class ClusterChildContext extends ApplicationChildContext {
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
-
- public String getServiceUuid() {
- return serviceUuid;
- }
-
- public void setServiceUuid(String serviceUuid) {
- this.serviceUuid = serviceUuid;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 3c8f65a..d9378ab 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -57,10 +57,10 @@ import java.util.*;
*/
public class DefaultApplicationParser implements ApplicationParser {
- private static final String METADATA_APPENDER = "-";
public static final String ALIAS = "alias";
public static final String CARTRIDGE_TYPE = "type";
public static final String LOAD_BALANCER = "lb";
+ private static final String METADATA_APPENDER = "-";
private static Log log = LogFactory.getLog(DefaultApplicationParser.class);
private List<ApplicationClusterContext> applicationClusterContexts;
@@ -110,7 +110,7 @@ public class DefaultApplicationParser implements ApplicationParser {
handleError("Invalid application definition, application alias is not found in application context");
}
- if (applicationContext.getApplicationUuid() == null || applicationContext.getApplicationUuid().isEmpty()) {
+ if (applicationContext.getApplicationId() == null || applicationContext.getApplicationId().isEmpty()) {
handleError("Invalid application definition, application id is not found in application context");
}
@@ -129,7 +129,7 @@ public class DefaultApplicationParser implements ApplicationParser {
handleError("Invalid application definition, subscribable information is not found in application context");
}
- oauthToken = createToken(applicationContext.getApplicationUuid());
+ oauthToken = createToken(applicationContext.getApplicationId());
return buildCompositeAppStructure(applicationContext, subscribablesInfo);
}
@@ -155,7 +155,7 @@ public class DefaultApplicationParser implements ApplicationParser {
for (CartridgeContext cartridgeContext : cartridgeContexts) {
if (cartridgeContext != null) {
SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
- addSubscribableInfo(applicationId, cartridgeContext.getUuid(), subscribableInfoContextMap, subscribableInfoContext);
+ addSubscribableInfo(applicationId, cartridgeContext.getType(), subscribableInfoContextMap, subscribableInfoContext);
}
}
}
@@ -167,7 +167,7 @@ public class DefaultApplicationParser implements ApplicationParser {
throws ApplicationDefinitionException {
String alias = subscribableInfoContext.getAlias();
- String autoscalingPolicyId = subscribableInfoContext.getAutoscalingPolicyUuid();
+ String autoscalingPolicyId = subscribableInfoContext.getAutoscalingPolicy();
if (StringUtils.isEmpty(alias)) {
handleError(String.format("An alias is not defined for cartridge: [application-id] %s" +
@@ -176,7 +176,7 @@ public class DefaultApplicationParser implements ApplicationParser {
if (!ApplicationUtils.isAliasValid(alias)) {
handleError(String.format("Alias is not valid: [application-id] %s " +
- "[cartridge-type] %s [alias] %s [valid-pattern] %s", applicationId, cartridgeType, alias,
+ "[cartridge-type] %s [alias] %s [valid-pattern] %s", applicationId, cartridgeType, alias,
ApplicationUtils.ALIAS_PATTERN.pattern()));
}
@@ -242,7 +242,7 @@ public class DefaultApplicationParser implements ApplicationParser {
Map<String, SubscribableInfoContext> subscribableInfoContextMap = new HashMap<String, SubscribableInfoContext>();
- String applicationId = applicationContext.getApplicationUuid();
+ String applicationId = applicationContext.getApplicationId();
ComponentContext componentContext = applicationContext.getComponents();
if (componentContext != null) {
CartridgeContext[] cartridgeContexts = componentContext.getCartridgeContexts();
@@ -258,7 +258,6 @@ public class DefaultApplicationParser implements ApplicationParser {
return subscribableInfoContextMap;
}
-
/**
* Builds the Application structure
*
@@ -271,14 +270,13 @@ public class DefaultApplicationParser implements ApplicationParser {
Map<String, SubscribableInfoContext> subscribableInfoCtxts)
throws ApplicationDefinitionException, CartridgeGroupNotFoundException, CartridgeNotFoundException {
- Application application = new Application(applicationContext.getApplicationUuid(),applicationContext.getTenantId());
+ Application application = new Application(applicationContext.getApplicationId());
// Set tenant information
application.setTenantId(applicationContext.getTenantId());
application.setTenantDomain(applicationContext.getTenantDomain());
application.setTenantAdminUserName(applicationContext.getTenantAdminUsername());
- application.setId(applicationContext.getApplicationId());
-
+
Set<StartupOrder> startupOrderSet = new LinkedHashSet<StartupOrder>();
DependencyOrder dependencyOrder = new DependencyOrder();
dependencyOrder.setStartupOrders(startupOrderSet);
@@ -333,7 +331,7 @@ public class DefaultApplicationParser implements ApplicationParser {
Set<StartupOrder> startupOrders = application.getDependencyOrder().getStartupOrders();
Map<String, Map<String, ClusterDataHolder>> clusterDataMap;
- clusterDataMap = parseLeafLevelSubscriptions(applicationContext.getApplicationUuid(),
+ clusterDataMap = parseLeafLevelSubscriptions(applicationContext.getApplicationId(),
applicationContext.getTenantId(), application.getKey(), null, cartridgeContextList, startupOrders);
application.setClusterData(clusterDataMap.get(ALIAS));
application.setClusterDataForType(clusterDataMap.get(CARTRIDGE_TYPE));
@@ -342,7 +340,7 @@ public class DefaultApplicationParser implements ApplicationParser {
// Set groups
if (components.getGroupContexts() != null) {
application.setGroups(
- parseGroups(applicationContext.getApplicationUuid(), applicationContext.getTenantId(),
+ parseGroups(applicationContext.getApplicationId(), applicationContext.getTenantId(),
application.getKey(), Arrays.asList(components.getGroupContexts()),
subscribableInfoCtxts));
}
@@ -353,16 +351,15 @@ public class DefaultApplicationParser implements ApplicationParser {
AutoscalerUtil.getAliasToDeploymentPolicyIdMapOfApplication(applicationContext));
if (log.isDebugEnabled()) {
- log.debug("Application parsed successfully: [application-id] " + applicationContext.getApplicationUuid());
+ log.debug("Application parsed successfully: [application-id] " + applicationContext.getApplicationId());
}
return application;
}
-
/**
* Parse Subscription Information
*
- * @param appUuid Application id
+ * @param appId Application id
* @param tenantId Tenant id of tenant which deployed the Application
* @param key Generated key for the Application
* @param groupName Group name (if relevant)
@@ -371,14 +368,14 @@ public class DefaultApplicationParser implements ApplicationParser {
* @throws ApplicationDefinitionException
*/
private Map<String, Map<String, ClusterDataHolder>> parseLeafLevelSubscriptions(
- String appUuid, int tenantId, String key, String groupName,
+ String appId, int tenantId, String key, String groupName,
List<CartridgeContext> cartridgeContextList, Set<StartupOrder> dependencyOrder) throws ApplicationDefinitionException, CartridgeNotFoundException {
Map<String, Map<String, ClusterDataHolder>> completeDataHolder = new HashMap<String, Map<String, ClusterDataHolder>>();
Map<String, ClusterDataHolder> clusterDataMap = new HashMap<String, ClusterDataHolder>();
Map<String, ClusterDataHolder> clusterDataMapByType = new HashMap<String, ClusterDataHolder>();
- createClusterDataMap(appUuid, cartridgeContextList, clusterDataMap, clusterDataMapByType,tenantId);
+ createClusterDataMap(appId, cartridgeContextList, clusterDataMap, clusterDataMapByType);
for (CartridgeContext cartridgeContext : cartridgeContextList) {
List<String> dependencyClusterIDs = new ArrayList<String>();
@@ -388,10 +385,9 @@ public class DefaultApplicationParser implements ApplicationParser {
SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
String subscriptionAlias = subscribableInfoContext.getAlias();
- Cartridge cartridge = getCartridgeByTenant(cartridgeType, tenantId);
+ Cartridge cartridge = getCartridge(cartridgeType);
if (cartridge == null) {
- throw new CartridgeNotFoundException(String.format("Cartridge not found [cartridge-uuid] %s " +
- "[cartridge-type] %s", cartridgeContext.getUuid(), cartridgeType));
+ throw new CartridgeNotFoundException("Cartridge not found " + cartridgeType);
}
// Add metadata keys defined in cartridges as export metadata keys
@@ -413,8 +409,8 @@ public class DefaultApplicationParser implements ApplicationParser {
clusterInfo = new STClusterInformation();
}
- String hostname = clusterInfo.getHostName(appUuid, subscriptionAlias, cartridge.getHostName());
- String clusterId = clusterInfo.getClusterId(appUuid, subscriptionAlias, cartridgeType);
+ String hostname = clusterInfo.getHostName(appId, subscriptionAlias, cartridge.getHostName());
+ String clusterId = clusterInfo.getClusterId(appId, subscriptionAlias, cartridgeType);
String repoUrl = null;
if (subscribableInfoContext.getArtifactRepositoryContext() != null) {
repoUrl = subscribableInfoContext.getArtifactRepositoryContext().getRepoUrl();
@@ -428,15 +424,15 @@ public class DefaultApplicationParser implements ApplicationParser {
String[] arrStartUp = startupOrderComponent.split("\\.");
if (arrStartUp[0].equals("cartridge")) {
String cartridgeAlias = arrStartUp[1];
- String dependentCartridgeUuid =
- getCartridgeUuid(cartridgeContextList, cartridgeAlias);
- if (StringUtils.isBlank(dependentCartridgeUuid)) {
+ String dependentCartridgeType =
+ findCartridgeTypeFromAlias(cartridgeContextList, cartridgeAlias);
+ if (StringUtils.isBlank(dependentCartridgeType)) {
throw new CartridgeNotFoundException(
String.format("Could not find dependent cartridge for " +
- "application: %s cartridge-alias: %s", appUuid, cartridgeAlias));
+ "application: %s cartridge-alias: %s", appId, cartridgeAlias));
}
- Cartridge dependencyCartridge = getCartridge(dependentCartridgeUuid);
- ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeUuid);
+ Cartridge dependencyCartridge = getCartridge(dependentCartridgeType);
+ ClusterDataHolder dataHolder = clusterDataMapByType.get(dependentCartridgeType);
if (dataHolder != null) {
if (!dataHolder.getClusterId().equals(clusterId)) {
@@ -475,14 +471,14 @@ public class DefaultApplicationParser implements ApplicationParser {
isLB = true;
}
// create and collect this cluster's information
- ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appUuid, groupName, cartridge,
+ ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridge,
key, tenantId, repoUrl, subscriptionAlias, clusterId, hostname,
- subscribableInfoContext.getDeploymentPolicyUuid(), isLB,
+ subscribableInfoContext.getDeploymentPolicy(), isLB,
tenantRange, subscribableInfoContext.getDependencyAliases(),
subscribableInfoContext.getProperties(), arrDependencyClusterIDs, arrExportMetadata,
- arrImportMetadata,subscribableInfoContext.getLvsVirtualIP());
+ arrImportMetadata, subscribableInfoContext.getLvsVirtualIP());
- appClusterCtxt.setAutoscalePolicyName(subscribableInfoContext.getAutoscalingPolicyUuid());
+ appClusterCtxt.setAutoscalePolicyName(subscribableInfoContext.getAutoscalingPolicy());
appClusterCtxt.setProperties(subscribableInfoContext.getProperties());
if (subscribableInfoContext.getPersistenceContext() != null) {
appClusterCtxt.setPersistenceContext(subscribableInfoContext.getPersistenceContext());
@@ -503,10 +499,10 @@ public class DefaultApplicationParser implements ApplicationParser {
* @param alias
* @return
*/
- private String getCartridgeUuid(List<CartridgeContext> cartridgeContextList, String alias) {
+ private String findCartridgeTypeFromAlias(List<CartridgeContext> cartridgeContextList, String alias) {
for (CartridgeContext cartridgeContext : cartridgeContextList) {
if (alias.equals(cartridgeContext.getSubscribableInfoContext().getAlias())) {
- return cartridgeContext.getUuid();
+ return cartridgeContext.getType();
}
}
return null;
@@ -514,7 +510,7 @@ public class DefaultApplicationParser implements ApplicationParser {
private void createClusterDataMap(String applicationId,
List<CartridgeContext> cartridgeContextList,
- Map<String, ClusterDataHolder> clusterDataMap, Map<String, ClusterDataHolder> clusterDataMapByType,int tenantId)
+ Map<String, ClusterDataHolder> clusterDataMap, Map<String, ClusterDataHolder> clusterDataMapByType)
throws ApplicationDefinitionException {
for (CartridgeContext cartridgeContext : cartridgeContextList) {
@@ -523,7 +519,7 @@ public class DefaultApplicationParser implements ApplicationParser {
String subscriptionAlias = subscribableInfoContext.getAlias();
// check if a cartridge with relevant type is already deployed. else, can't continue
- Cartridge cartridge = getCartridgeByTenant(cartridgeType, tenantId);
+ Cartridge cartridge = getCartridge(cartridgeType);
if (cartridge == null) {
handleError("No deployed Cartridge found with type [ " + cartridgeType +
" ] for Composite Application");
@@ -540,12 +536,12 @@ public class DefaultApplicationParser implements ApplicationParser {
String clusterId = clusterInfo.getClusterId(applicationId, subscriptionAlias, cartridgeType);
// add relevant information to the map
- ClusterDataHolder clusterDataHolderPerType = new ClusterDataHolder(cartridgeType, clusterId, cartridge.getUuid());
+ ClusterDataHolder clusterDataHolderPerType = new ClusterDataHolder(cartridgeType, clusterId);
clusterDataHolderPerType.setMinInstances(cartridgeContext.getCartridgeMin());
clusterDataHolderPerType.setMaxInstances(cartridgeContext.getCartridgeMax());
clusterDataMapByType.put(cartridgeType, clusterDataHolderPerType);
// add relevant information to the map
- ClusterDataHolder clusterDataHolder = new ClusterDataHolder(cartridgeType, clusterId, cartridge.getUuid());
+ ClusterDataHolder clusterDataHolder = new ClusterDataHolder(cartridgeType, clusterId);
clusterDataHolder.setMinInstances(cartridgeContext.getCartridgeMin());
clusterDataHolder.setMaxInstances(cartridgeContext.getCartridgeMax());
clusterDataMap.put(subscriptionAlias, clusterDataHolder);
@@ -571,7 +567,7 @@ public class DefaultApplicationParser implements ApplicationParser {
Map<String, Group> groupAliasToGroup = new HashMap<String, Group>();
for (GroupContext groupCtxt : groupCtxts) {
- ServiceGroup serviceGroup = getServiceGroup(groupCtxt.getUuid());
+ ServiceGroup serviceGroup = getServiceGroup(groupCtxt.getName());
if (serviceGroup == null) {
log.error("Cartridge group not found group-name: " + groupCtxt.getName());
throw new CartridgeGroupNotFoundException("Cartridge group not found group-name: "
@@ -729,7 +725,7 @@ public class DefaultApplicationParser implements ApplicationParser {
DependencyOrder dependencyOrder = new DependencyOrder();
// create the Dependency Ordering
- String[] startupOrders = getStartupOrderForGroup(groupCtxt.getUuid(), serviceGroup);
+ String[] startupOrders = getStartupOrderForGroup(groupCtxt.getName(), serviceGroup);
Set<StartupOrder> setStartUpOrder = null;
if (startupOrders != null) {
setStartUpOrder = ParserUtils.convertStartupOrder(startupOrders, groupCtxt);
@@ -741,7 +737,7 @@ public class DefaultApplicationParser implements ApplicationParser {
}
}
- String[] scaleDependents = getScaleDependentForGroup(groupCtxt.getUuid(), serviceGroup);
+ String[] scaleDependents = getScaleDependentForGroup(groupCtxt.getName(), serviceGroup);
if (scaleDependents != null) {
dependencyOrder.setScalingDependents(ParserUtils.convertScalingDependentList(scaleDependents, groupCtxt));
} else {
@@ -751,7 +747,7 @@ public class DefaultApplicationParser implements ApplicationParser {
}
}
- dependencyOrder.setTerminationBehaviour(getTerminationBehaviour(groupCtxt.getUuid(), serviceGroup));
+ dependencyOrder.setTerminationBehaviour(getTerminationBehaviour(groupCtxt.getName(), serviceGroup));
group.setDependencyOrder(dependencyOrder);
Map<String, Map<String, ClusterDataHolder>> clusterDataMap;
@@ -793,21 +789,19 @@ public class DefaultApplicationParser implements ApplicationParser {
* Find the startup order
*
* @param serviceGroup GroupContext with Group defintion information
- * @param serviceGroupUuid Group Uuid
* @return Set of Startup Orders which are defined in the Group
* @throws ApplicationDefinitionException
*/
- private String[] getStartupOrderForGroup(String serviceGroupUuid, ServiceGroup serviceGroup) throws
- ApplicationDefinitionException {
+ private String[] getStartupOrderForGroup(String serviceGroupName, ServiceGroup serviceGroup) throws ApplicationDefinitionException {
- ServiceGroup nestedServiceGroup = getNestedServiceGroup(serviceGroupUuid, serviceGroup);
+ ServiceGroup nestedServiceGroup = getNestedServiceGroup(serviceGroupName, serviceGroup);
if (nestedServiceGroup == null) {
- handleError("Service Group Definition not found for name " + serviceGroupUuid);
+ handleError("Service Group Definition not found for name " + serviceGroupName);
}
if (log.isDebugEnabled()) {
- log.debug("parsing application ... getStartupOrderForGroup: " + serviceGroupUuid);
+ log.debug("parsing application ... getStartupOrderForGroup: " + serviceGroupName);
}
assert nestedServiceGroup != null;
@@ -836,16 +830,16 @@ public class DefaultApplicationParser implements ApplicationParser {
* @return Set of Startup Orders which are defined in the Group
* @throws ApplicationDefinitionException
*/
- private String[] getScaleDependentForGroup(String serviceGroupUuid, ServiceGroup serviceGroup) throws ApplicationDefinitionException {
+ private String[] getScaleDependentForGroup(String serviceGroupName, ServiceGroup serviceGroup) throws ApplicationDefinitionException {
- ServiceGroup nestedServiceGroup = getNestedServiceGroup(serviceGroupUuid, serviceGroup);
+ ServiceGroup nestedServiceGroup = getNestedServiceGroup(serviceGroupName, serviceGroup);
if (nestedServiceGroup == null) {
- handleError("Service Group Definition not found for uuid " + serviceGroupUuid);
+ handleError("Service Group Definition not found for name " + serviceGroupName);
}
if (log.isDebugEnabled()) {
- log.debug("parsing application ... getScaleDependentForGroup: " + serviceGroupUuid);
+ log.debug("parsing application ... getScaleDependentForGroup: " + serviceGroupName);
}
assert nestedServiceGroup != null;
@@ -870,16 +864,16 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Get kill behaviour related to a Group
*
- * @param serviceGroupUuid Group Uuid
+ * @param serviceGroupName Group name
* @return String indicating the kill behavior
* @throws ApplicationDefinitionException if an error occurs
*/
- private String getTerminationBehaviour(String serviceGroupUuid, ServiceGroup serviceGroup) throws ApplicationDefinitionException {
+ private String getTerminationBehaviour(String serviceGroupName, ServiceGroup serviceGroup) throws ApplicationDefinitionException {
- ServiceGroup nestedServiceGroup = getNestedServiceGroup(serviceGroupUuid, serviceGroup);
+ ServiceGroup nestedServiceGroup = getNestedServiceGroup(serviceGroupName, serviceGroup);
if (nestedServiceGroup == null) {
- handleError("Service Group Definition not found for name " + serviceGroupUuid);
+ handleError("Service Group Definition not found for name " + serviceGroupName);
}
assert nestedServiceGroup != null;
@@ -891,13 +885,13 @@ public class DefaultApplicationParser implements ApplicationParser {
}
- private ServiceGroup getNestedServiceGroup(String serviceGroupUuid, ServiceGroup serviceGroup) {
- if (serviceGroup.getUuid().equals(serviceGroupUuid)) {
+ private ServiceGroup getNestedServiceGroup(String serviceGroupName, ServiceGroup serviceGroup) {
+ if (serviceGroup.getName().equals(serviceGroupName)) {
return serviceGroup;
} else if (serviceGroup.getGroups() != null) {
ServiceGroup[] groups = serviceGroup.getGroups();
for (ServiceGroup sg : groups) {
- return getNestedServiceGroup(serviceGroupUuid, sg);
+ return getNestedServiceGroup(serviceGroupName, sg);
}
}
return null;
@@ -907,16 +901,16 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Retrieves deployed service group
*
- * @param serviceGroupUuid Service Group uuid
+ * @param serviceGroupName name of the Service Group
* @return ServiceGroup instance if exists
* @throws ApplicationDefinitionException if no Service Group found for the given serviceGroupName
*/
- private ServiceGroup getServiceGroup(String serviceGroupUuid) throws ApplicationDefinitionException {
+ private ServiceGroup getServiceGroup(String serviceGroupName) throws ApplicationDefinitionException {
try {
- return RegistryManager.getInstance().getServiceGroup(serviceGroupUuid);
+ return RegistryManager.getInstance().getServiceGroup(serviceGroupName);
} catch (Exception e) {
- String errorMsg = "Could not read cartridge group: " + serviceGroupUuid;
+ String errorMsg = "Could not read cartridge group: " + serviceGroupName;
log.error(errorMsg, e);
throw new ApplicationDefinitionException(errorMsg, e);
}
@@ -926,7 +920,7 @@ public class DefaultApplicationParser implements ApplicationParser {
/**
* Creates a ApplicationClusterContext object to keep information related to a Cluster in this Application
*
- * @param applicationUuid Application uuid
+ * @param appId Application id
* @param groupName Group name
* @param cartridge Cartridge information
* @param subscriptionKey Generated key for the Application
@@ -935,32 +929,29 @@ public class DefaultApplicationParser implements ApplicationParser {
* @param alias alias specified for this Subscribable in the Application Definition
* @param clusterId Cluster id
* @param hostname Hostname
- * @param deploymentPolicyUuid Deployment policy uuid
+ * @param deploymentPolicy Deployment policy used
* @param isLB if this cluster is an LB
* @param dependencyClustorIDs
* @return ApplicationClusterContext object with relevant information
* @throws ApplicationDefinitionException If any error occurs
*/
- private ApplicationClusterContext createApplicationClusterContext(String applicationUuid, String groupName,
- Cartridge cartridge,
+ private ApplicationClusterContext createApplicationClusterContext(String appId, String groupName, Cartridge cartridge,
String subscriptionKey, int tenantId, String repoUrl,
String alias, String clusterId, String hostname,
- String deploymentPolicyUuid, boolean isLB,
- String tenantRange,
+ String deploymentPolicy, boolean isLB, String tenantRange,
String[] dependencyAliases, Properties properties, String[] dependencyClustorIDs,
- String[] exportMetadata, String[] importMetadata,String lvsVirtualIP)
+ String[] exportMetadata, String[] importMetadata, String lvsVirtualIP)
throws ApplicationDefinitionException {
// Create text payload
- PayloadData payloadData = ApplicationUtils.createPayload(applicationUuid, groupName, cartridge, subscriptionKey, tenantId, clusterId,
- hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken, dependencyClustorIDs, exportMetadata, importMetadata,lvsVirtualIP);
+ PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridge, subscriptionKey, tenantId, clusterId,
+ hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken, dependencyClustorIDs, exportMetadata, importMetadata, lvsVirtualIP);
String textPayload = payloadData.toString();
if (log.isDebugEnabled()) {
log.debug("Payload :: " + textPayload);
}
- return new ApplicationClusterContext(cartridge.getUuid(), clusterId, hostname, textPayload, deploymentPolicyUuid,
- isLB, tenantRange, dependencyClustorIDs);
+ return new ApplicationClusterContext(cartridge.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB, tenantRange, dependencyClustorIDs);
}
public String createToken(String applicationId) throws AutoScalerException {
@@ -998,26 +989,16 @@ public class DefaultApplicationParser implements ApplicationParser {
return token;
}
- private Cartridge getCartridge(String cartridgeUuid) throws ApplicationDefinitionException {
+ private Cartridge getCartridge(String cartridgeType) throws ApplicationDefinitionException {
try {
- return CloudControllerServiceClient.getInstance().getCartridge(cartridgeUuid);
+ return CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
} catch (Exception e) {
- log.error("Unable to get the cartridge: " + cartridgeUuid, e);
+ log.error("Unable to get the cartridge: " + cartridgeType, e);
throw new ApplicationDefinitionException(e);
}
}
- private Cartridge getCartridgeByTenant(String cartridgeType,int tenantId) throws ApplicationDefinitionException {
-
- try {
- return CloudControllerServiceClient.getInstance().getCartridgeByTenant(cartridgeType, tenantId);
- } catch (Exception e) {
- log.error(String.format("Unable to get the cartridge: %s %d " , cartridgeType , tenantId), e);
- throw new ApplicationDefinitionException(e);
- }
- }
-
private void handleError(String errorMsg) throws ApplicationDefinitionException {
log.error(errorMsg);
throw new ApplicationDefinitionException(errorMsg);
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
index 7b69d18..aa42b7f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/ParserUtils.java
@@ -247,7 +247,7 @@ public class ParserUtils {
private static String getAliasForServiceType(String serviceType, GroupContext groupContext) {
for (CartridgeContext subCtxt : groupContext.getCartridgeContexts()) {
- if (serviceType.equals(subCtxt.getUuid())) {
+ if (serviceType.equals(subCtxt.getType())) {
return subCtxt.getSubscribableInfoContext().getAlias();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
index ee14a56..67d88e4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
@@ -36,7 +36,6 @@ public class BasicPayloadData implements Serializable {
private String appId;
private String groupName;
private String serviceName;
- private String serviceType;
private String clusterId;
private String hostName;
private int tenantId;
@@ -74,8 +73,6 @@ public class BasicPayloadData implements Serializable {
payloadBuilder.append(",");
payloadBuilder.append("SERVICE_NAME=" + getServiceName());
payloadBuilder.append(",");
- payloadBuilder.append("SERVICE_TYPE=" + getServiceType());
- payloadBuilder.append(",");
payloadBuilder.append("HOST_NAME=" + getHostName());
payloadBuilder.append(",");
payloadBuilder.append("MULTITENANT=" + getMultitenant());
@@ -414,12 +411,4 @@ public class BasicPayloadData implements Serializable {
public void setLvsVirtualIP(String lvsVirtualIP) {
this.lvsVirtualIP = lvsVirtualIP;
}
-
- public String getServiceType() {
- return serviceType;
- }
-
- public void setServiceType(String serviceType) {
- this.serviceType = serviceType;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
index 35c68d2..cd48cd4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationClusterContext.java
@@ -29,8 +29,6 @@ public class ApplicationClusterContext implements Serializable {
// cluster id
private String clusterId;
- // cartridge uuid
- private String cartridgeUuid;
// cartridge type
private String cartridgeType;
// payload as a String
@@ -49,11 +47,11 @@ public class ApplicationClusterContext implements Serializable {
private String[] dependencyClusterIds;
private PersistenceContext persistenceContext;
- public ApplicationClusterContext(String cartridgeUuid, String clusterId, String hostName,
+ public ApplicationClusterContext(String cartridgeType, String clusterId, String hostName,
String textPayload, String deploymentPolicyName, boolean isLbCluster,
String tenantRange, String[] dependencyClusterIds) {
- this.cartridgeUuid = cartridgeUuid;
+ this.cartridgeType = cartridgeType;
this.clusterId = clusterId;
this.hostName = hostName;
this.textPayload = textPayload;
@@ -78,14 +76,6 @@ public class ApplicationClusterContext implements Serializable {
this.clusterId = clusterId;
}
- public String getCartridgeUuid() {
- return cartridgeUuid;
- }
-
- public void setCartridgeUuid(String cartridgeUuid) {
- this.cartridgeUuid = cartridgeUuid;
- }
-
public String getCartridgeType() {
return cartridgeType;
}
@@ -154,12 +144,12 @@ public class ApplicationClusterContext implements Serializable {
ApplicationClusterContext that = (ApplicationClusterContext) other;
- return this.cartridgeUuid.equals(that.cartridgeUuid) &&
+ return this.cartridgeType.equals(that.cartridgeType) &&
this.clusterId.equals(that.clusterId);
}
public int hashCode() {
- return this.cartridgeUuid.hashCode() + this.clusterId.hashCode();
+ return this.cartridgeType.hashCode() + this.clusterId.hashCode();
}
public String[] getDependencyClusterIds() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
index 9828eee..5c2b1f2 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/ApplicationContext.java
@@ -25,14 +25,11 @@ import java.io.Serializable;
public class ApplicationContext implements Serializable {
- private static final long serialVersionUID = 6704036501869668646L;
-
public static final String STATUS_CREATED = "Created";
public static final String STATUS_DEPLOYED = "Deployed";
public static final String STATUS_UNDEPLOYING = "Undeploying";
-
- private String applicationUuid;
- private String applicationId;
+ private static final long serialVersionUID = 6704036501869668646L;
+ private String applicationId;
private String alias;
private boolean multiTenant;
private String name;
@@ -47,12 +44,12 @@ public class ApplicationContext implements Serializable {
public ApplicationContext() {
}
- public String getApplicationUuid() {
- return applicationUuid;
+ public String getApplicationId() {
+ return applicationId;
}
- public void setApplicationUuid(String applicationUuid) {
- this.applicationUuid = applicationUuid;
+ public void setApplicationId(String applicationId) {
+ this.applicationId = applicationId;
}
public String getAlias() {
@@ -135,12 +132,4 @@ public class ApplicationContext implements Serializable {
public void setDescription(String description) {
this.description = description;
}
-
- public String getApplicationId() {
- return applicationId;
- }
-
- public void setApplicationId(String applicationId) {
- this.applicationId = applicationId;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
index 39e074d..fc84f0b8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/CartridgeContext.java
@@ -25,27 +25,17 @@ public class CartridgeContext implements Serializable {
private static final long serialVersionUID = 7782017881026018352L;
- private String uuid;
- private int tenantId;
- private String type;
+ private String type;
private int cartridgeMin;
private int cartridgeMax;
private SubscribableInfoContext subscribableInfoContext;
- public String getUuid() {
- return uuid;
+ public String getType() {
+ return type;
}
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public int getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(int tenantId) {
- this.tenantId = tenantId;
+ public void setType(String type) {
+ this.type = type;
}
public int getCartridgeMin() {
@@ -73,11 +63,4 @@ public class CartridgeContext implements Serializable {
this.subscribableInfoContext = subscribableInfoContext;
}
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
index 83b7ac6..2a344de 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/GroupContext.java
@@ -25,8 +25,6 @@ public class GroupContext implements Serializable {
private static final long serialVersionUID = 1595266728968445926L;
- private String uuid;
- private int tenantId;
private String name;
private String alias;
@@ -37,28 +35,10 @@ public class GroupContext implements Serializable {
private String deploymentPolicy;
- private String deploymentPolicyUuid;
-
private CartridgeContext[] cartridgeContexts;
private GroupContext[] groupContexts;
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public int getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(int tenantId) {
- this.tenantId = tenantId;
- }
-
public String getName() {
return name;
}
@@ -114,12 +94,4 @@ public class GroupContext implements Serializable {
public void setDeploymentPolicy(String deploymentPolicy) {
this.deploymentPolicy = deploymentPolicy;
}
-
- public String getDeploymentPolicyUuid() {
- return deploymentPolicyUuid;
- }
-
- public void setDeploymentPolicyUuid(String deploymentPolicyUuid) {
- this.deploymentPolicyUuid = deploymentPolicyUuid;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4b864473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
index 01c0b98..c4b57f0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/pojo/SubscribableInfoContext.java
@@ -28,10 +28,8 @@ public class SubscribableInfoContext implements Serializable {
private static final long serialVersionUID = -6874644941002783034L;
private String alias;
- private String deploymentPolicy;
- private String autoscalingPolicy;
- private String deploymentPolicyUuid;
- private String autoscalingPolicyUuid;
+ private String deploymentPolicy;
+ private String autoscalingPolicy;
private int minMembers;
private int maxMembers;
private String[] dependencyAliases;
@@ -49,20 +47,20 @@ public class SubscribableInfoContext implements Serializable {
this.alias = alias;
}
- public String getDeploymentPolicyUuid() {
- return deploymentPolicyUuid;
+ public String getDeploymentPolicy() {
+ return deploymentPolicy;
}
- public void setDeploymentPolicyUuid(String deploymentPolicyUuid) {
- this.deploymentPolicyUuid = deploymentPolicyUuid;
+ public void setDeploymentPolicy(String deploymentPolicy) {
+ this.deploymentPolicy = deploymentPolicy;
}
- public String getAutoscalingPolicyUuid() {
- return autoscalingPolicyUuid;
+ public String getAutoscalingPolicy() {
+ return autoscalingPolicy;
}
- public void setAutoscalingPolicyUuid(String autoscalingPolicyUuid) {
- this.autoscalingPolicyUuid = autoscalingPolicyUuid;
+ public void setAutoscalingPolicy(String autoscalingPolicy) {
+ this.autoscalingPolicy = autoscalingPolicy;
}
public String[] getDependencyAliases() {
@@ -113,27 +111,11 @@ public class SubscribableInfoContext implements Serializable {
this.persistenceContext = persistenceContext;
}
- public String getLvsVirtualIP() {
+ public String getLvsVirtualIP() {
return lvsVirtualIP;
}
public void setLvsVirtualIP(String lvsVirtualIP) {
this.lvsVirtualIP = lvsVirtualIP;
}
-
- public String getDeploymentPolicy() {
- return deploymentPolicy;
- }
-
- public void setDeploymentPolicy(String deploymentPolicy) {
- this.deploymentPolicy = deploymentPolicy;
- }
-
- public String getAutoscalingPolicy() {
- return autoscalingPolicy;
- }
-
- public void setAutoscalingPolicy(String autoscalingPolicy) {
- this.autoscalingPolicy = autoscalingPolicy;
- }
}