Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7cc189eb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7cc189eb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7cc189eb Branch: refs/heads/master Commit: 7cc189eb803aa841b6064bb28285dd041da847c2 Parents: 5e60755 7d4abd0 Author: Chamila de Alwis <[email protected]> Authored: Wed Oct 15 13:54:38 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Wed Oct 15 13:54:38 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 17 + .../exception/InvalidArgumentException.java | 46 + .../interfaces/AutoScalerServiceInterface.java | 8 + .../monitor/AbstractClusterMonitor.java | 4 + .../monitor/ClusterMonitorFactory.java | 38 +- .../monitor/KubernetesClusterMonitor.java | 67 +- .../KubernetesServiceClusterMonitor.java | 41 + .../autoscaler/monitor/VMLbClusterMonitor.java | 8 + .../monitor/VMServiceClusterMonitor.java | 7 + .../rule/AutoscalerRuleEvaluator.java | 4 +- .../autoscaler/rule/RuleTasksDelegator.java | 31 +- .../stratos/autoscaler/TestRulesPackaged.java | 6 +- .../java/org/apache/stratos/cli/RestClient.java | 52 +- .../stratos/cli/RestCommandLineService.java | 916 ++++++++----------- .../apache/stratos/cli/StratosApplication.java | 13 +- .../autoscaler/partition/PropertyBean.java | 6 + .../stratos/cli/beans/topology/Cluster.java | 14 + .../stratos/cli/beans/topology/Member.java | 19 +- .../commands/DeployKubernetesGroupCommand.java | 9 +- .../commands/DeployKubernetesHostCommand.java | 9 +- .../cli/commands/DeployPartitionCommand.java | 21 +- .../DescribeCartridgeSubscriptionCommand.java | 95 ++ .../commands/ListAutoscalePolicyCommand.java | 1 - .../ListCartridgeSubscriptionsCommand.java | 84 +- .../cli/commands/ListCartridgesCommand.java | 3 +- .../commands/ListDeploymentPolicyCommand.java | 1 - .../ListSubscribedCartridgesCommand.java | 120 --- .../cli/commands/SubscribeCartridgeCommand.java | 42 +- .../commands/UpdateKubernetesHostCommand.java | 109 +++ .../commands/UpdateKubernetesMasterCommand.java | 109 +++ .../UpdateSubscriptionPropertiesCommand.java | 135 +++ .../apache/stratos/cli/utils/CliConstants.java | 5 + .../org/apache/stratos/cli/utils/CliUtils.java | 63 +- .../impl/CloudControllerServiceImpl.java | 20 +- .../CartridgeInstanceDataPublisher.java | 26 +- .../controller/topology/TopologyBuilder.java | 5 +- .../topology/TopologyEventPublisher.java | 8 +- .../common/constants/StratosConstants.java | 1 + .../conf/LoadBalancerConfiguration.java | 4 +- .../manager/client/AutoscalerServiceClient.java | 5 + .../CartridgeSubscriptionDataPublisher.java | 25 +- .../model/TopologyClusterInformationModel.java | 12 +- .../broker/publish/EventPublisherPool.java | 1 - .../broker/publish/TopicPublisher.java | 92 +- .../broker/subscribe/TopicSubscriber.java | 54 +- .../messaging/domain/topology/Cluster.java | 17 +- .../messaging/domain/topology/Member.java | 19 +- .../event/topology/InstanceSpawnedEvent.java | 8 +- .../InstanceSpawnedMessageProcessor.java | 7 +- .../stat/HealthStatEventMessageListener.java | 45 +- .../InstanceNotifierEventMessageListener.java | 46 +- .../stratos/messaging/util/Constants.java | 2 +- .../rest/endpoint/bean/topology/Cluster.java | 21 +- .../rest/endpoint/bean/topology/Member.java | 17 +- .../bean/util/converter/PojoConverter.java | 23 +- .../rest/endpoint/services/ServiceUtils.java | 28 + .../rest/endpoint/services/StratosAdmin.java | 13 + .../extension/FaultHandlingWindowProcessor.java | 43 +- .../modules/distribution/src/assembly/bin.xml | 22 +- .../distribution/src/main/conf/autoscaler.xml | 2 +- .../src/main/conf/container-mincheck.drl | 72 -- .../src/main/conf/container-scaling.drl | 163 ---- .../src/main/conf/drools/container-mincheck.drl | 73 ++ .../src/main/conf/drools/container-scaling.drl | 173 ++++ .../src/main/conf/drools/mincheck.drl | 83 ++ .../src/main/conf/drools/scaling.drl | 205 +++++ .../src/main/conf/drools/terminateall.drl | 44 + .../distribution/src/main/conf/mincheck.drl | 83 -- .../distribution/src/main/conf/scaling.drl | 205 ----- .../distribution/src/main/conf/terminateall.drl | 44 - .../src/main/resources/AutoScalerService.wsdl | 366 +++++--- 71 files changed, 2440 insertions(+), 1740 deletions(-) ----------------------------------------------------------------------
