Repository: stratos Updated Branches: refs/heads/tenant-isolation 08e31240d -> b553f49d0
Update the references with uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/474ba3a4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/474ba3a4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/474ba3a4 Branch: refs/heads/tenant-isolation Commit: 474ba3a4cf846b79a9ecacaa039bffac11576a1a Parents: 08e3124 Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 10 20:00:50 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 10 20:00:50 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/context/cluster/ClusterContext.java | 2 +- .../cloud/controller/services/impl/CloudControllerServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/474ba3a4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java index 1f8971b..532f806 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java @@ -204,7 +204,7 @@ public class ClusterContext extends AbstractClusterContext { NetworkPartitionRef networkPartitionRef = null; if (networkPartitions != null && networkPartitions.length != 0) { for (NetworkPartitionRef networkPartition2 : networkPartitions) { - if (networkPartition2.getUuid().equals( + if (networkPartition2.getId().equals( clusterInstance.getNetworkPartitionId())) { networkPartitionRef = networkPartition2; } http://git-wip-us.apache.org/repos/asf/stratos/blob/474ba3a4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 6cd52f3..ad52722 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -371,7 +371,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } // Validate iaas provider - IaasProvider iaasProvider = CloudControllerContext.getInstance().getIaasProviderOfPartition(cartridge.getType(), partitionId); + IaasProvider iaasProvider = CloudControllerContext.getInstance().getIaasProviderOfPartition(cartridge.getUuid(), partitionId); if (iaasProvider == null) { String msg = String.format("Could not start instance, " + "IaaS provider not found in cartridge %s for partition %s, " +
