Refinement to the AS services
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/527e4dc8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/527e4dc8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/527e4dc8 Branch: refs/heads/master Commit: 527e4dc8268b88fe0d7d6b65fb416e78bdf46948 Parents: 5efccf2 Author: Udara Liyanage <[email protected]> Authored: Tue Dec 10 20:21:10 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Dec 10 20:21:10 2013 -0500 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 27 +++++--------------- .../deployment/policy/DeploymentPolicy.java | 22 +++++----------- .../autoscaler/policy/PolicyManager.java | 6 ++++- 3 files changed, 18 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/527e4dc8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java ---------------------------------------------------------------------- diff --git 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 index 6ffb204..40d5e66 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 @@ -41,7 +41,7 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface{ private static final Log log = LogFactory.getLog(AutoScalerServiceImpl.class); public Partition[] getAllAvailablePartitions(){ - return PartitionManager.getInstance().getAllPartitions(); + return PartitionManager.getInstance().getAllPartitions(); } public DeploymentPolicy[] getAllDeploymentPolicies(){ @@ -82,42 +82,27 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface{ @Override public Partition getPartition(String partitionId) { - for(Partition par: this.getAllAvailablePartitions()){ - if(par.getId().equals(partitionId)){ - return par; - } - } - return null; + return PartitionManager.getInstance().getPartitionById(partitionId); } @Override public DeploymentPolicy getDeploymentPolicy(String deploymentPolicyId) { - for(DeploymentPolicy depPol : this.getAllDeploymentPolicies()){ - if(depPol.getId().equals(deploymentPolicyId)){ - return depPol; - } - } - return null; + return PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId); } @Override public AutoscalePolicy getAutoscalingPolicy(String autoscalingPolicyId) { - for(AutoscalePolicy asPol : this.getAllAutoScalingPolicy()){ - if(asPol.getId().equals(autoscalingPolicyId)) - return asPol; - } - return null; + return PolicyManager.getInstance().getAutoscalePolicy(autoscalingPolicyId); } @Override public PartitionGroup[] getPartitionGroups(String deploymentPolicyId) { - this.getDeploymentPolicy(deploymentPolicyId).getAllPartitions(); - return null; + return PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId).getPartitionGroups(); } @Override public Partition[] getPartitionsOfDeploymentPolicy(String depPolicy, String partitonGroupId) { - DeploymentPolicy depPol = this.getDeploymentPolicy(depPolicy); + DeploymentPolicy depPol = PolicyManager.getInstance().getDeploymentPolicy(depPolicy); if(null == depPol) return null; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/527e4dc8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java index c955fff..e8b3478 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java @@ -36,7 +36,6 @@ public class DeploymentPolicy implements Serializable{ private static final long serialVersionUID = 5675507196284400099L; private String id; private PartitionGroup[] partitionGroups; - private Partition[] allPartitions; /** * Gets the value of the id property. @@ -62,27 +61,20 @@ public class DeploymentPolicy implements Serializable{ this.id = value; } - @SuppressWarnings("unchecked") public void setPartitionGroups(PartitionGroup[] groups) { - ArrayList<Partition> partitionslist = new ArrayList<Partition>(); this.partitionGroups = groups; - /* - if(allPartitions == null) { - allPartitions = new ArrayList<Partition>(); - } - */ - for (PartitionGroup partitionGroup : groups) { + } + + @SuppressWarnings("unchecked") + public Partition[] getAllPartitions() { + ArrayList<Partition> partitionslist = new ArrayList<Partition>(); + for (PartitionGroup partitionGroup : this.getPartitionGroups()) { Partition[] partitions = partitionGroup.getPartitions(); if(partitions != null) { partitionslist.addAll(Arrays.asList(partitions)); } } - - this.allPartitions = partitionslist.toArray(new Partition[0]); - } - - public Partition[] getAllPartitions() { - return allPartitions; + return partitionslist.toArray(new Partition[0]); } public Partition getPartitionById(String id){ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/527e4dc8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java index d0de31c..c7d4605 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java @@ -71,13 +71,17 @@ public class PolicyManager { public boolean deployAutoscalePolicy(AutoscalePolicy policy) throws InvalidPolicyException { this.addASPolicyToInformationModel(policy); this.persitASPolicy(asResourcePath+ policy.getId(), policy); + + log.info("AutoScaling policy :" + policy.getId() + " is deployed successfully."); return true; } // Add the policy to information model and persist. public boolean deployDeploymentscalePolicy(DeploymentPolicy policy) throws InvalidPolicyException { this.addDeploymentPolicyToInformationModel(policy); - this.persitDeploymentPolicy(deploymentPolicyResourcePath+ policy.getId(), policy); + this.persitDeploymentPolicy(deploymentPolicyResourcePath+ policy.getId(), policy); + + log.info("Deployment policy :" + policy.getId() + " is deployed successfully."); return true; }
