Updated Branches: refs/heads/master 224f2007f -> ba20d4b6f
Refactoring Deployement policy and its deployer Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5a80c805 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5a80c805 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5a80c805 Branch: refs/heads/master Commit: 5a80c80585782f6e5b38e1032703fd238904b8e4 Parents: fe32cc5 Author: Udara Liyanage <[email protected]> Authored: Mon Nov 25 13:19:36 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Nov 25 13:19:36 2013 -0500 ---------------------------------------------------------------------- .../policy/deployers/DeploymentPolicyReader.java | 17 +++++++++++++---- .../deployment-policies/economy-deployment.xml | 6 ++---- 2 files changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a80c805/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java index 24e98fc..ab8f106 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyReader.java @@ -52,23 +52,32 @@ public class DeploymentPolicyReader extends AbstractPolicyReader<DeploymentPoli OMElement docEle = getDocument(); if("deploymentPolicy".equalsIgnoreCase(docEle.getLocalName())){ policy.setId(docEle.getAttributeValue(new QName("id"))); + //Partition-Groups - OMElement partitionGroupsEle = docEle.getFirstChildWithName(new QName("partitionGroups")); - Iterator<?> partitionGroupItr = partitionGroupsEle.getChildrenWithLocalName("partitionGroup"); + Iterator<?> partitionGroupItr = docEle.getChildrenWithLocalName("partitionGroup"); while(partitionGroupItr.hasNext()){ Object nextGroup = partitionGroupItr.next(); if(nextGroup instanceof OMElement){ OMElement groupEle = (OMElement) nextGroup; PartitionGroup group = new PartitionGroup(); + group.setId(groupEle.getAttributeValue(new QName("id"))); group.setPartitionAlgo(readValue(groupEle, "partitionAlgo")); + //Partitions - OMElement partitionsEle = groupEle.getFirstChildWithName(new QName("partitions")); - Iterator<?> partitionItr = partitionsEle.getChildrenWithLocalName("partition"); + Iterator<?> partitionItr = groupEle.getChildrenWithLocalName("partition"); while(partitionItr.hasNext()){ Object next = partitionItr.next(); if(next instanceof OMElement){ OMElement partitionEle = (OMElement) next; Partition partition = new Partition(); + Iterator<?> partitionPropItr = partitionEle.getChildrenWithLocalName("property"); + while(partitionPropItr.hasNext()) + { + Object nextProperty = partitionPropItr.next(); + if(nextProperty instanceof OMElement){ + OMElement property = (OMElement)nextProperty; + } + } partition.setId(partitionEle.getAttributeValue(new QName("id"))); partition.setPartitionMax(Integer.valueOf(readValue(partitionEle, "max"))); partition.setPartitionMin(Integer.valueOf(readValue(partitionEle, "min"))); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5a80c805/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml index 74c9dfa..ab9fb0e 100644 --- a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml +++ b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <deploymentPolicy id ="economy-deployment"> - <partitionGroups> <partitionGroup id="group1" > - <partitionAlgo>OneAfterAnother</partitionAlgo> + <partitionAlgo>one-after-another</partitionAlgo> <partition id="partition1" > <max>3</max> <min>1</min> @@ -17,7 +16,7 @@ </partition> </partitionGroup> <partitionGroup id="group2" > - <partitionAlgo>RoundRobin</partitionAlgo> + <partitionAlgo>round-robin</partitionAlgo> <partition id="partition4" > <max>3</max> <min>1</min> @@ -31,5 +30,4 @@ <min>1</min> </partition> </partitionGroup> - </partitionGroups> </deploymentPolicy>
