Update the NetworkPartitionAlgorithmContext with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c2fa8425 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c2fa8425 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c2fa8425 Branch: refs/heads/tenant-isolation Commit: c2fa842522b07b12fd1b3321a6df03e1b178f721 Parents: b87d128 Author: Gayan Gunarathne <[email protected]> Authored: Wed Jul 22 15:13:19 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Wed Jul 22 15:13:19 2015 +0530 ---------------------------------------------------------------------- .../networkpartition/AllAtOnceAlgorithm.java | 4 +- .../util/converter/ObjectConverter.java | 4 +- .../main/resources/CloudControllerService.wsdl | 712 +++++++++---------- 3 files changed, 360 insertions(+), 360 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c2fa8425/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java index 3d5dc24..4e52496 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java @@ -40,7 +40,7 @@ public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm { return null; } - String[] networkPartitions = applicationPolicy.getNetworkPartitions(); + String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid(); if (networkPartitions == null || networkPartitions.length == 0) { return null; } @@ -61,7 +61,7 @@ public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm { return null; } - String[] networkPartitions = applicationPolicy.getNetworkPartitions(); + String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid(); if (networkPartitions == null || networkPartitions.length == 0) { return null; } http://git-wip-us.apache.org/repos/asf/stratos/blob/c2fa8425/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 bd4d57e..7ed7b84 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 @@ -1729,7 +1729,7 @@ public class ObjectConverter { } ApplicationInfoBean applicationBean = new ApplicationInfoBean(); - applicationBean.setId(application.getUniqueIdentifier()); + applicationBean.setId(application.getId()); applicationBean.setName(application.getName()); applicationBean.setStatus(application.getStatus().name()); applicationBean.setDescription(application.getDescription()); @@ -1753,7 +1753,7 @@ public class ObjectConverter { for (ApplicationInstance applicationInstance : applicationInstancesInTopology) { ApplicationInstanceBean instance = new ApplicationInstanceBean(); - instance.setInstanceId(applicationInstance.getInstanceId()); + instance.setInstanceId(applicationInstance.getAlias()); instance.setApplicationId(application.getUniqueIdentifier()); instance.setParentInstanceId(applicationInstance.getParentId()); instance.setStatus(applicationInstance.getStatus().toString());
