Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/246686a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/246686a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/246686a0 Branch: refs/heads/master Commit: 246686a0568794050c3c46baef7569498c889df1 Parents: ba96ca1 5ec2224 Author: Manula Thantriwatte <[email protected]> Authored: Wed Dec 11 09:54:59 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Wed Dec 11 09:54:59 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 36 +- .../internal/ADCManagementServerComponent.java | 13 + .../adc/mgt/listener/TopologyEventListner.java | 40 ++ .../mgt/subscription/CartridgeSubscription.java | 3 +- .../SubscriptionMultiTenantBehaviour.java | 25 +- .../processor/InstanceStatusProcessor.java | 409 ++++++++++++++++ .../event/processor/TopologyEventProcessor.java | 33 ++ .../processor/TopologyEventProcessorChain.java | 59 +++ .../topology/model/TopologyClusterModel.java | 477 +++++++++++++++++++ .../apache/stratos/autoscaler/Constants.java | 3 + .../autoscaler/NetworkPartitionContext.java | 171 +++++++ .../autoscaler/api/AutoScalerServiceImpl.java | 93 ++-- .../deployment/policy/DeploymentPolicy.java | 22 +- .../exception/NonExistingLBException.java | 43 ++ .../interfaces/AutoScalerServiceInterface.java | 10 +- .../internal/AutoscalerServerComponent.java | 217 +++++++-- .../autoscaler/partition/PartitionManager.java | 89 +++- .../partition/deployers/PartitionDeployer.java | 2 +- .../autoscaler/policy/PolicyManager.java | 122 ++--- .../deployers/AutoscalerPolicyDeployer.java | 7 +- .../deployers/DeploymentPolicyDeployer.java | 6 +- .../policy/model/AutoscalePolicy.java | 5 +- .../autoscaler/policy/model/LoadAverage.java | 7 +- .../autoscaler/policy/model/LoadThresholds.java | 5 +- .../policy/model/MemoryConsumption.java | 7 +- .../policy/model/RequestsInFlight.java | 7 +- .../autoscaler/registry/RegistryManager.java | 21 +- .../autoscaler/util/AutoScalerConstants.java | 2 + .../stratos/autoscaler/util/AutoscalerUtil.java | 2 + .../stratos/autoscaler/util/Deserializer.java | 96 ++++ .../cloud/controller/iaases/AWSEC2Iaas.java | 10 - .../controller/iaases/OpenstackNovaIaas.java | 26 +- .../cloud/controller/pojo/Cartridge.java | 20 + .../cloud/controller/pojo/CartridgeConfig.java | 20 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../controller/pojo/LoadbalancerConfig.java | 70 +++ .../topology/TopologyEventSender.java | 6 +- .../controller/util/CloudControllerUtil.java | 8 + .../WSO2CEPInFlightRequestPublisher.java | 13 +- .../extension/api/LoadBalancerStatsReader.java | 3 +- .../TenantAwareLoadBalanceEndpoint.java | 31 +- .../balancer/mediators/ResponseInterceptor.java | 26 +- ...adBalancerInFlightRequestCountCollector.java | 71 ++- .../WSO2CEPInFlightRequestCountObserver.java | 36 +- .../stratos/load/balancer/util/Constants.java | 3 + .../messaging/domain/topology/Cluster.java | 10 +- .../event/topology/ClusterCreatedEvent.java | 2 +- .../apache/stratos/rest/endpoint/Constants.java | 6 +- .../definition/CartridgeDefinitionBean.java | 3 + .../cartridge/definition/LoadBalancerBean.java | 4 + .../bean/util/converter/PojoConverter.java | 12 +- .../rest/endpoint/services/ServiceUtils.java | 245 +++++++++- .../rest/endpoint/services/StratosAdmin.java | 48 +- .../LoadBalancerStatisticsEventBuilder.xml | 4 +- .../AverageRequestsInflightFinder.xml | 4 +- .../GradientOfRequestsInFlightFinder.xml | 6 +- ...SecondDerivativeOfRequestsInFlightFinder.xml | 6 +- .../stream-manager-config.xml | 9 +- .../haproxy/extension/HAProxyStatsReader.java | 34 +- .../src/main/resources/AutoScalerService.wsdl | 122 ++++- .../main/resources/CloudControllerService.wsdl | 21 +- 61 files changed, 2557 insertions(+), 364 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/246686a0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ----------------------------------------------------------------------
