fixing deployment retrieving issue in the rest API
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e926de81 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e926de81 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e926de81 Branch: refs/heads/master Commit: e926de8177d60dfe41355973bd4d564d4e584439 Parents: 6500f8d Author: reka <[email protected]> Authored: Fri May 15 12:18:16 2015 +0530 Committer: reka <[email protected]> Committed: Fri May 15 12:18:28 2015 +0530 ---------------------------------------------------------------------- .../context/partition/PartitionContext.java | 2 +- .../services/impl/AutoscalerServiceImpl.java | 2 +- .../common/partition/NetworkPartitionRef.java | 4 +- .../util/converter/ObjectConverter.java | 9 +- .../src/main/resources/AutoscalerService.wsdl | 819 ++++++++++--------- 5 files changed, 424 insertions(+), 412 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e926de81/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java index 93b4591..d1f6fae 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java @@ -97,7 +97,7 @@ public abstract class PartitionContext implements Serializable { public int getMax() { return PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId) .getNetworkPartitionByNetworkPartitionId(networkPartitionId) - .getPartition(partitionId).getPartitionMax(); + .getPartitionRef(partitionId).getPartitionMax(); } public void setIsObsoletePartition(boolean isObsoletePartition) { http://git-wip-us.apache.org/repos/asf/stratos/blob/e926de81/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index 2a439df..9986df3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -1104,7 +1104,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { for (ClusterLevelPartitionContext clusterLevelPartitionContext : clusterInstanceContext.getPartitionCtxts()) { - if (null == networkPartition.getPartition(clusterLevelPartitionContext.getPartitionId())) { + if (null == networkPartition.getPartitionRef(clusterLevelPartitionContext.getPartitionId())) { //It has found that this partition context which is in cluster monitor is removed in updated policy clusterLevelPartitionContext.setIsObsoletePartition(true); http://git-wip-us.apache.org/repos/asf/stratos/blob/e926de81/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartitionRef.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartitionRef.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartitionRef.java index 999be1a..00df0a5 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartitionRef.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/NetworkPartitionRef.java @@ -33,7 +33,7 @@ public class NetworkPartitionRef implements Serializable { private PartitionRef[] partitionRefs; private String partitionAlgo; - public void setPartitions(PartitionRef[] partitionRefs) { + public void setPartitionRefs(PartitionRef[] partitionRefs) { if (partitionRefs == null) { this.partitionRefs = partitionRefs; } else { @@ -65,7 +65,7 @@ public class NetworkPartitionRef implements Serializable { this.id = id; } - public PartitionRef getPartition(String partitionId) { + public PartitionRef getPartitionRef(String partitionId) { for (PartitionRef partitionRef : partitionRefs) { if (partitionRef.getId().equals(partitionId)) { return partitionRef; http://git-wip-us.apache.org/repos/asf/stratos/blob/e926de81/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 064d7b7..c82cd8e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -497,8 +497,9 @@ public class ObjectConverter { for (NetworkPartitionRef networkPartitionRef : networkPartitions) { NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean(); networkPartitionReferenceBean.setId(networkPartitionRef.getId()); + networkPartitionReferenceBean.setPartitionAlgo(networkPartitionRef.getPartitionAlgo()); networkPartitionReferenceBean.setPartitions( - convertASStubPartitionsToPartitions(networkPartitionRef.getPartitions())); + convertASStubPartitionsToPartitions(networkPartitionRef.getPartitionRefs())); networkPartitionBeans.add(networkPartitionReferenceBean); } @@ -663,6 +664,7 @@ public class ObjectConverter { for (PartitionRef partition : partitions) { PartitionReferenceBean partitionBean = new PartitionReferenceBean(); partitionBean.setId(partition.getId()); + partitionBean.setPartitionMax(partition.getPartitionMax()); partitionBeans.add(partitionBean); } return partitionBeans; @@ -1836,7 +1838,8 @@ public class ObjectConverter { NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean(); networkPartitionReferenceBean.setId(networkPartition.getId()); networkPartitionReferenceBean.setPartitionAlgo(networkPartition.getPartitionAlgo()); - networkPartitionReferenceBean.setPartitions(convertASStubPartitionRefsToPartitionReferences(networkPartition.getPartitions())); + networkPartitionReferenceBean.setPartitions( + convertASStubPartitionRefsToPartitionReferences(networkPartition.getPartitionRefs())); networkPartitionBeans.add(networkPartitionReferenceBean); } @@ -1892,7 +1895,7 @@ public class ObjectConverter { NetworkPartitionRef networkPartitionRef = new NetworkPartitionRef(); networkPartitionRef.setId(networkPartitionReferenceBean.getId()); networkPartitionRef.setPartitionAlgo(networkPartitionReferenceBean.getPartitionAlgo()); - networkPartitionRef.setPartitions(convertToASStubPartitions( + networkPartitionRef.setPartitionRefs(convertToASStubPartitions( networkPartitionReferenceBean.getPartitions())); networkPartitionRefList.add(networkPartitionRef); }
