You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/11/30 11:23:48 UTC
git commit: Remove partition dependency Currently in policy deployer
needs valid partitions. partition deployer should run first. SO desplay a
warning if a valid partition is not deplyed yet
Updated Branches:
refs/heads/master 560b1c5fc -> 8838a2a37
Remove partition dependency
Currently in policy deployer needs valid partitions. partition deployer should run first.
SO desplay a warning if a valid partition is not deplyed yet
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8838a2a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8838a2a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8838a2a3
Branch: refs/heads/master
Commit: 8838a2a37e438611cafa1d0c9ffdaa9c780e53bf
Parents: 560b1c5
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Nov 30 15:42:06 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Nov 30 15:53:29 2013 -0500
----------------------------------------------------------------------
.../policy/deployers/DeploymentPolicyReader.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8838a2a3/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 7dc235a..59689aa 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
@@ -35,9 +35,6 @@ import org.apache.stratos.autoscaler.policy.InvalidPolicyException;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
import org.apache.stratos.cloud.controller.deployment.partition.PartitionGroup;
import org.apache.stratos.cloud.controller.deployment.policy.DeploymentPolicy;
-import org.apache.stratos.cloud.controller.pojo.Properties;
-import org.apache.stratos.cloud.controller.pojo.Property;
-
/**
*
* The Reader class for Deployment-policy definitions.
@@ -78,16 +75,17 @@ public class DeploymentPolicyReader extends AbstractPolicyReader<DeploymentPoli
OMElement partitionEle = (OMElement) next;
String partitionId = partitionEle.getAttributeValue(new QName("id"));
+ /*
Partition partition = PartitionManager.getInstance().getPartitionById(partitionId);
- // If a partition with this name does not exist in the partition list.
+ If a partition with this name does not exist in the partition list.
if(partition == null)
- throw new InvalidPolicyException("No Partition found matching ID " + partitionId);
-
+ log.info("No Partition found with matching ID " + partitionId);
+ */
+ Partition partition = new Partition();
+ partition.setId(partitionId);
partition.setPartitionMax(Integer.valueOf(readValue(partitionEle, "max")));
partition.setPartitionMin(Integer.valueOf(readValue(partitionEle, "min")));
// partition.setProvider(readValue(partitionEle, "provider"));
- //TODO partition validation before policy deployment
-// validatePartition();
partitions.add(partition);
}
}