Merge remote-tracking branch 'upstream/master' into ui
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c4f1ec3d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c4f1ec3d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c4f1ec3d Branch: refs/heads/master Commit: c4f1ec3df1972a7cb6b87badb6d06756818a9587 Parents: 2b89162 f2beacc Author: anuruddhal <[email protected]> Authored: Wed Sep 2 14:51:35 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Wed Sep 2 14:51:35 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 | 53 +- .../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 | 821 ++++++--- .../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 | 28 +- .../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 | 53 +- .../messaging/topology/TopologyBuilder.java | 1476 ++++++++-------- .../services/CloudControllerService.java | 66 +- .../impl/CloudControllerServiceImpl.java | 513 ++++-- .../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 + .../rest/endpoint/api/StratosApiV40Utils.java | 7 +- .../rest/endpoint/api/StratosApiV41.java | 302 ++-- .../rest/endpoint/api/StratosApiV41Utils.java | 1278 ++++++++------ .../util/converter/ObjectConverter.java | 337 ++-- 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/test/resources/suite-1/agent.conf | 45 - .../src/test/resources/suite-1/jndi.properties | 22 - .../src/test/resources/suite-1/logging.ini | 52 - .../src/test/resources/suite-3/agent.conf | 45 - .../test-conf/integration-test.properties | 3 +- products/python-cartridge-agent/pom.xml | 4 +- .../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 +- products/stratos/modules/integration/pom.xml | 11 + .../integration/tests/RestConstants.java | 8 + .../tests/StratosTestServerManager.java | 104 +- .../integration/tests/TopologyHandler.java | 243 ++- .../application/ApplicationBurstingTest.java | 189 +- .../application/ApplicationUpdateTest.java | 312 ++-- .../application/GroupStartupOrderTest.java | 358 ++-- .../GroupTerminationBehaviorTest.java | 174 +- .../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/JMSOutputAdaptor.xml | 30 - .../test/resources/common/JMSOutputAdaptor.xml | 30 + .../src/test/resources/common/jndi.properties | 22 + .../src/test/resources/common/log4j.properties | 206 +++ .../src/test/resources/common/mock-iaas.xml | 123 ++ .../src/test/resources/common/scaling.drl | 311 ++++ ...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 +++++++++++ .../src/test/resources/jndi.properties | 22 - .../src/test/resources/mock-iaas.xml | 123 -- .../integration/src/test/resources/scaling.drl | 311 ---- .../single-cluster-scaling-test.json | 2 +- .../src/test/resources/stratos-testing.xml | 128 +- .../src/test/resources/tenant/tenant1.json | 9 + .../src/test/resources/tenant/tenant2.json | 9 + .../test-conf/integration-test.properties | 6 +- .../artifacts/application.json | 2 +- .../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 | 1639 +++++++++++++----- .../main/resources/CloudControllerService.wsdl | 1369 +++++++++------ .../main/resources/StratosManagerService.wsdl | 268 +-- 248 files changed, 16250 insertions(+), 7467 deletions(-) ----------------------------------------------------------------------
