Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Conflicts:
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7d8da1d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7d8da1d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7d8da1d6
Branch: refs/heads/master
Commit: 7d8da1d6f8fd9144f467062af14b012ae1f85975
Parents: 41f4e81 013a47c
Author: Udara Liyanage <[email protected]>
Authored: Mon Dec 2 09:42:22 2013 -0500
Committer: Udara Liyanage <[email protected]>
Committed: Mon Dec 2 09:42:22 2013 -0500
----------------------------------------------------------------------
.../stratos/autoscaler/ClusterContext.java | 17 +-
.../algorithm/AutoscaleAlgorithm.java | 2 +-
.../autoscaler/algorithm/OneAfterAnother.java | 2 +-
.../PartitionGroupOneAfterAnother.java | 2 +-
.../autoscaler/algorithm/RoundRobin.java | 2 +-
.../autoscaler/api/AutoScalerServiceImpl.java | 2 +-
.../cloud/controller/CloudControllerClient.java | 10 +-
.../deployment/policy/DeploymentPolicy.java | 95 +
.../exception/InvalidPartitionException.java | 22 +
.../exception/InvalidPolicyException.java | 40 +
.../exception/PolicyValidationException.java | 4 +
.../autoscaler/partition/PartitionGroup.java | 87 +
.../partition/deployers/PartitionDeployer.java | 38 +-
.../partition/deployers/PartitionReader.java | 102 +-
.../policy/InvalidPolicyException.java | 40 -
.../autoscaler/policy/PolicyManager.java | 3 +-
.../policy/deployers/AbstractPolicyReader.java | 5 +-
.../deployers/AutoscalerPolicyDeployer.java | 2 +-
.../deployers/AutoscalerPolicyReader.java | 2 +-
.../deployers/DeploymentPolicyDeployer.java | 4 +-
.../deployers/DeploymentPolicyReader.java | 50 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 174 +-
.../stratos/autoscaler/util/ConfUtil.java | 8 +
.../policy/DeploymentPolicyDeployerTest.java | 3 +-
.../policy/PartitionDeployerTest.java | 66 +
.../src/test/resources/autoscaler-old.drl | 79 +
.../src/test/resources/deployment-policy.xml | 2 +-
.../src/test/resources/partition.xml | 10 +
.../src/test/resources/partitions.xml | 15 +
.../controller/axiom/AxiomXpathParser.java | 1776 ------------------
.../controller/axiom/AxiomXpathParserUtil.java | 1 -
.../parser/CloudControllerConfigParser.java | 10 -
.../axiom/parser/ServiceConfigParser.java | 563 ------
.../controller/deployers/CartridgeDeployer.java | 33 +-
.../deployers/CloudControllerDeployer.java | 1 -
.../controller/deployers/ServiceDeployer.java | 152 --
.../deployment/partition/PartitionGroup.java | 87 -
.../deployment/policy/DeploymentPolicy.java | 93 -
.../exception/InvalidPartitionException.java | 4 +
.../cloud/controller/iaases/AWSEC2Iaas.java | 7 +-
.../controller/iaases/OpenstackNovaIaas.java | 11 +-
.../impl/CloudControllerServiceImpl.java | 581 ++----
.../interfaces/CloudControllerService.java | 3 +-
.../cloud/controller/persist/Deserializer.java | 32 +-
.../cloud/controller/persist/Serializer.java | 36 +-
.../cloud/controller/pojo/ClusterContext.java | 5 +-
.../controller/pojo/DataPublisherConfig.java | 5 +-
.../stratos/cloud/controller/pojo/Host.java | 73 -
.../cloud/controller/pojo/IaasContext.java | 162 --
.../cloud/controller/pojo/IaasProvider.java | 21 -
.../cloud/controller/pojo/LocationScope.java | 70 -
.../cloud/controller/pojo/MemberContext.java | 5 +-
.../cloud/controller/pojo/Properties.java | 5 +-
.../stratos/cloud/controller/pojo/Property.java | 5 +-
.../stratos/cloud/controller/pojo/Region.java | 125 --
.../cloud/controller/pojo/ServiceContext.java | 366 ----
.../stratos/cloud/controller/pojo/Zone.java | 90 -
.../CartridgeInstanceDataPublisherTask.java | 336 ++--
.../controller/registry/RegistryManager.java | 15 +-
.../runtime/FasterLookUpDataHolder.java | 254 ++-
.../controller/topology/TopologyBuilder.java | 27 +-
.../topology/TopologyEventSender.java | 1 -
.../controller/topology/TopologyManager.java | 9 +-
.../validate/AWSEC2PartitionValidator.java | 4 +-
.../OpenstackNovaPartitionValidator.java | 6 +-
.../service/axiom/AxiomValidationTest.java | 2 -
.../service/util/ServiceContextTest.java | 47 -
.../load/balancer/conf/SynapseConfigurator.java | 184 ++
.../internal/LoadBalancerServiceComponent.java | 3 +
.../balancer/test/RoundRobinAlgorithmTest.java | 70 +
.../sample/configuration/loadbalancer1.conf | 2 +-
.../sample/configuration/loadbalancer2.conf | 2 +-
.../sample/configuration/loadbalancer3.conf | 2 +-
.../messaging/domain/topology/Cluster.java | 18 -
.../messaging/domain/topology/Member.java | 28 +-
.../event/topology/InstanceSpawnedEvent.java | 21 +-
.../distribution/src/main/assembly/bin.xml | 1 +
.../synapse-configs/default/sequences/main.xml | 29 +-
.../main/resources/CloudControllerService.wsdl | 104 +-
79 files changed, 1603 insertions(+), 4772 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7d8da1d6/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --cc
components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
index 723ee0f,0000000..e4769da
mode 100644,000000..100644
---
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
+++
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
@@@ -1,50 -1,0 +1,50 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.autoscaler.api;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
++import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
+import org.apache.stratos.autoscaler.partition.PartitionManager;
+import org.apache.stratos.autoscaler.policy.PolicyManager;
+import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
+import org.apache.stratos.cloud.controller.deployment.partition.Partition;
- import org.apache.stratos.cloud.controller.deployment.policy.DeploymentPolicy;
+
+/**
+ * Auto Scaler Service API is responsible getting Partitions and Policies.
+ */
+public class AutoScalerServiceImpl {
+
+ private static final Log log =
LogFactory.getLog(AutoScalerServiceImpl.class);
+
+ public List<Partition> getAllAvailablePartitions(){
+ return PartitionManager.getInstance().getAllPartitions();
+ }
+
+ public List<DeploymentPolicy> getAllDeploymentPolicies(){
+ return PolicyManager.getInstance().getDeploymentPolicyList();
+ }
+
+ public List<AutoscalePolicy> getAllAutoScalingPolicy(){
+ return PolicyManager.getInstance().getAutoscalePolicyList();
+ }
+
+}
