Add uuid for the partition references
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1958abd8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1958abd8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1958abd8 Branch: refs/heads/tenant-isolation Commit: 1958abd870d760c60fd4881c78d9f6d91e62e401 Parents: eb8cfe2 Author: Gayan Gunarathne <[email protected]> Authored: Tue Jul 28 20:17:39 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jul 28 20:17:39 2015 +0530 ---------------------------------------------------------------------- .../client/AutoscalerCloudControllerClient.java | 2 +- .../context/cluster/ClusterContext.java | 6 +- .../context/partition/PartitionContext.java | 2 +- .../monitor/cluster/ClusterMonitor.java | 2 +- .../monitor/component/GroupMonitor.java | 6 +- .../services/impl/AutoscalerServiceImpl.java | 6 +- .../util/AutoscalerObjectConverter.java | 7 +- .../context/CloudControllerContext.java | 6 +- .../impl/CloudControllerServiceImpl.java | 8 +- .../common/beans/partition/PartitionBean.java | 28 +- .../beans/partition/PartitionReferenceBean.java | 28 +- .../common/partition/NetworkPartitionRef.java | 2 +- .../stratos/common/partition/PartitionRef.java | 37 +- .../rest/endpoint/api/StratosApiV41Utils.java | 10 + .../stratos/rest/endpoint/mock/MockContext.java | 2 +- .../util/converter/ObjectConverter.java | 15 +- .../src/main/resources/AutoscalerService.wsdl | 884 ++++++++++--------- 17 files changed, 561 insertions(+), 490 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java index 712bf2f..8f6c656 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java @@ -89,7 +89,7 @@ public class AutoscalerCloudControllerClient { if (log.isInfoEnabled()) { log.info(String.format("Trying to spawn an instance via cloud controller: " + "[cluster] %s [partition] %s [network-partition-id] %s", - clusterId, partition.getId(), networkPartitionId)); + clusterId, partition.getUuid(), networkPartitionId)); } XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/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 80f9da1..9e35f4e 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 @@ -278,7 +278,7 @@ public class ClusterContext extends AbstractClusterContext { String partitionId; if (partition != null) { //use it own defined partition - partitionId = partition.getId(); + partitionId = partition.getUuid(); maxInstances = partition.getPartitionMax(); } else { //handling the partition given by the parent @@ -302,7 +302,7 @@ public class ClusterContext extends AbstractClusterContext { PartitionRef partition3 = null; if (partitions != null && partitions.length != 0) { for (PartitionRef partition2 : partitions) { - if (partition2.getId().equals(partitionId)) { + if (partition2.getUuid().equals(partitionId)) { partition3 = partition2; } } @@ -346,7 +346,7 @@ public class ClusterContext extends AbstractClusterContext { String ClusterInstanceId) { for (Member member : cluster.getMembers()) { String memberId = member.getMemberId(); - if (member.getPartitionId().equalsIgnoreCase(partition.getId()) && + if (member.getPartitionId().equalsIgnoreCase(partition.getUuid()) && member.getClusterInstanceId().equals(ClusterInstanceId)) { MemberContext memberContext = new MemberContext(); memberContext.setClusterId(member.getClusterId()); http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/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 d1f6fae..c28ea0f 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 @@ -51,7 +51,7 @@ public abstract class PartitionContext implements Serializable { public PartitionContext(PartitionRef partition, String networkPartitionId, String deploymentPolicyId) { this.partition = partition; this.deploymentPolicyId = deploymentPolicyId; - this.partitionId = partition.getId(); + this.partitionId = partition.getUuid(); this.networkPartitionId = networkPartitionId; } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index 442ed77..f4c3d0c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -479,7 +479,7 @@ public class ClusterMonitor extends Monitor { && partitionContext.getTerminationPendingMembers().size() == 0 && partitionContext.getObsoletedMembers().size() == 0) { - instanceContext.removePartitionCtxt(partitionContext.getPartition().getId()); + instanceContext.removePartitionCtxt(partitionContext.getPartition().getUuid()); } } }; http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index 171a104..3bb2254 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -775,14 +775,14 @@ public class GroupMonitor extends ParentComponentMonitor { if (partitions != null && partitions.length != 0) { for (PartitionRef partition : partitions) { - if (networkPartitionContext.getPartitionCtxt(partition.getId()) == null) { + if (networkPartitionContext.getPartitionCtxt(partition.getUuid()) == null) { GroupLevelPartitionContext groupLevelPartitionContext = new GroupLevelPartitionContext( - partition.getId(), networkPartitionId, deploymentPolicyId); + partition.getUuid(), networkPartitionId, deploymentPolicyId); networkPartitionContext.addPartitionContext(groupLevelPartitionContext); if (log.isInfoEnabled()) { log.info(String.format("[Partition] %s has been added for the [Group] %s", - partition.getId(), this.id)); + partition.getUuid(), this.id)); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/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 a191c97..0fe7d94 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 @@ -1301,11 +1301,11 @@ public class AutoscalerServiceImpl implements AutoscalerService { // network partition - partition id should be already added for (PartitionRef partitionRef : networkPartitionRef.getPartitionRefs()) { - String partitionId = partitionRef.getId(); + String partitionId = partitionRef.getUuid(); boolean isPartitionFound = false; for (Partition partition : networkPartitionForTenant.getPartitions()) { - if (partition.getId().equals(partitionId)) { + if (partition.getUuid().equals(partitionId)) { isPartitionFound = true; } } @@ -1464,7 +1464,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { for (InstanceContext instanceContext : clusterLevelNetworkPartitionContext.getInstanceIdToInstanceContextMap().values()) { ClusterInstanceContext clusterInstanceContext = (ClusterInstanceContext) instanceContext; - if (null == clusterInstanceContext.getPartitionCtxt(partition.getId())) { + if (null == clusterInstanceContext.getPartitionCtxt(partition.getUuid())) { //It has found that this partition which is in deployment policy/network partition is new ClusterLevelPartitionContext clusterLevelPartitionContext = new ClusterLevelPartitionContext( http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerObjectConverter.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerObjectConverter.java index 609d36c..131fa26 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerObjectConverter.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerObjectConverter.java @@ -62,7 +62,7 @@ public class AutoscalerObjectConverter { org.apache.stratos.cloud.controller.stub.domain.Partition cloudControllerPartition = new org.apache.stratos.cloud.controller.stub.domain.Partition(); - cloudControllerPartition.setId(partition.getId()); + cloudControllerPartition.setId(partition.getUuid()); cloudControllerPartition.setDescription(partition.getDescription()); cloudControllerPartition.setKubernetesClusterId(partition.getKubernetesClusterId()); cloudControllerPartition.setProperties(AutoscalerUtil.toStubProperties(partition.getProperties())); @@ -120,8 +120,9 @@ public class AutoscalerObjectConverter { public static PartitionRef convertCCPartitionToPartition(org.apache.stratos.cloud.controller.stub.domain.Partition ccPartition) { PartitionRef partition = new PartitionRef(); - - partition.setId(ccPartition.getId()); + partition.setId(ccPartition.getId()); + partition.setUuid(ccPartition.getUuid()); + partition.setTenantId(ccPartition.getTenantId()); partition.setDescription(ccPartition.getDescription()); partition.setProperties(convertCCPropertiesToProperties(ccPartition.getProperties())); http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java index b749e1b..bc4f934 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java @@ -803,12 +803,12 @@ public class CloudControllerContext implements Serializable { } } - public IaasProvider getIaasProviderOfPartition(String cartridgeType, String partitionId) { + public IaasProvider getIaasProviderOfPartition(String cartridgeUuid, String partitionId) { if (log.isDebugEnabled()) { log.debug("Retrieving partition: " + partitionId + " for the Cartridge: " + this.hashCode() + ". " - + "Current Partition List: " + getPartitionToIaasProvider(cartridgeType).keySet().toString()); + + "Current Partition List: " + getPartitionToIaasProvider(cartridgeUuid).keySet().toString()); } - return getPartitionToIaasProvider(cartridgeType).get(partitionId); + return getPartitionToIaasProvider(cartridgeUuid).get(partitionId); } public Map<String, IaasProvider> getPartitionToIaasProvider(String cartridgeType) { http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/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 45d52dc..5727689 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 @@ -169,9 +169,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { private void copyIaasProviders(Cartridge destCartridge, Cartridge sourceCartridge) { - List<IaasProvider> newIaasProviders = CloudControllerContext.getInstance().getIaasProviders(destCartridge.getType()); + List<IaasProvider> newIaasProviders = CloudControllerContext.getInstance().getIaasProviders(destCartridge.getUuid()); - Map<String, IaasProvider> iaasProviderMap = CloudControllerContext.getInstance().getPartitionToIaasProvider(sourceCartridge.getType()); + Map<String, IaasProvider> iaasProviderMap = CloudControllerContext.getInstance().getPartitionToIaasProvider(sourceCartridge.getUuid()); if (iaasProviderMap != null) { for (Entry<String, IaasProvider> entry : iaasProviderMap.entrySet()) { @@ -358,7 +358,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { handleNullObject(partition, "Could not start instance, partition is null"); // Validate cluster - String partitionId = partition.getUuid(); + String partitionId = partition.getId(); String clusterId = instanceContext.getClusterId(); ClusterContext clusterContext = CloudControllerContext.getInstance().getClusterContext(clusterId); handleNullObject(clusterContext, "Could not start instance, cluster context not found: [cluster-id] " + clusterId); @@ -492,7 +492,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { memberContext.setClusterInstanceId(instanceContext.getClusterInstanceId()); memberContext.setNetworkPartitionId(instanceContext.getNetworkPartitionId()); memberContext.setPartition(cloudControllerContext.getNetworkPartition(instanceContext.getNetworkPartitionId()). - getPartition(instanceContext.getPartition().getUuid())); + getPartition(instanceContext.getPartition().getId())); memberContext.setInitTime(instanceContext.getInitTime()); memberContext.setProperties(instanceContext.getProperties()); memberContext.setLoadBalancingIPType(loadBalancingIPType); http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java index b6a6fee..d5c5802 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java @@ -27,16 +27,18 @@ import java.util.List; @XmlRootElement public class PartitionBean { - private String id; + private String uuid; + private String id; private String description; private List<PropertyBean> property; + private int tenantId; - public String getId() { - return id; + public String getUuid() { + return uuid; } - public void setId(String id) { - this.id = id; + public void setUuid(String uuid) { + this.uuid = uuid; } public String getDescription() { @@ -54,4 +56,20 @@ public class PartitionBean { public void setProperty(List<PropertyBean> property) { this.property = property; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java index a7b57c2..8b54a11 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java @@ -27,17 +27,19 @@ import java.util.List; @XmlRootElement public class PartitionReferenceBean { - private String id; + private String uuid; + private String id; private String description; private List<PropertyBean> property; private int partitionMax; + private int tenantId; - public String getId() { - return id; + public String getUuid() { + return uuid; } - public void setId(String id) { - this.id = id; + public void setUuid(String uuid) { + this.uuid = uuid; } public String getDescription() { @@ -63,4 +65,20 @@ public class PartitionReferenceBean { public void setPartitionMax(int partitionMax) { this.partitionMax = partitionMax; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/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 d801ace..de2b4a4 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 @@ -76,7 +76,7 @@ public class NetworkPartitionRef implements Serializable { public PartitionRef getPartitionRef(String partitionId) { for (PartitionRef partitionRef : partitionRefs) { - if (partitionRef.getId().equals(partitionId)) { + if (partitionRef.getUuid().equals(partitionId)) { return partitionRef; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/PartitionRef.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/PartitionRef.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/PartitionRef.java index 249cc2c..acdaf7f 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/PartitionRef.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/partition/PartitionRef.java @@ -35,29 +35,30 @@ public class PartitionRef implements Serializable { /** * provider should match with an IaasProvider type. */ - private String id; + private String uuid; + private String id; private String description; private int partitionMax; private Properties properties = new Properties(); - + private int tenantId; /** * Gets the value of the id property. * * @return possible object is * {@link String } */ - public String getId() { - return id; + public String getUuid() { + return uuid; } /** * Sets the value of the id property. * - * @param id allowed object is + * @param uuid allowed object is * {@link String } */ - public void setId(String id) { - this.id = id; + public void setUuid(String uuid) { + this.uuid = uuid; } /** @@ -98,12 +99,12 @@ public class PartitionRef implements Serializable { @Override public String toString() { - return "Partition [id=" + id + ", description=" + description + ", properties=" + properties + "]"; + return "Partition [id=" + uuid + ", description=" + description + ", properties=" + properties + "]"; } public boolean equals(Object obj) { if (obj != null && obj instanceof PartitionRef) { - return this.id.equals(((PartitionRef) obj).getId()); + return this.uuid.equals(((PartitionRef) obj).getUuid()); } return false; @@ -111,7 +112,7 @@ public class PartitionRef implements Serializable { @Override public int hashCode() { - return this.id.hashCode(); + return this.uuid.hashCode(); } public int getPartitionMax() { @@ -121,4 +122,20 @@ public class PartitionRef implements Serializable { public void setPartitionMax(int partitionMax) { this.partitionMax = partitionMax; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getTenantId() { + return tenantId; + } + + public void setTenantId(int tenantId) { + this.tenantId = tenantId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 35e11bf..13aee9e 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -49,6 +49,8 @@ import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean; import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean; import org.apache.stratos.common.beans.partition.NetworkPartitionBean; import org.apache.stratos.common.beans.partition.NetworkPartitionReferenceBean; +import org.apache.stratos.common.beans.partition.PartitionBean; +import org.apache.stratos.common.beans.partition.PartitionReferenceBean; import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean; import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean; import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; @@ -2955,6 +2957,14 @@ public class StratosApiV41Utils { if (networkPartitionBean.getTenantId() == deploymentPolicyDefinitionBean.getTenantId() && networkPartitionBean.getId().equals(networkPartitionReferenceBean.getId())) { networkPartitionReferenceBean.setUuid(networkPartitionBean.getUuid()); + for(PartitionReferenceBean partition: networkPartitionReferenceBean.getPartitions()){ + for(PartitionBean existingPartition: networkPartitionBean.getPartitions()){ + if(existingPartition.getTenantId()== deploymentPolicyDefinitionBean.getTenantId() && partition.getId().equals(existingPartition.getId())){ + partition.setUuid(existingPartition.getUuid()); + partition.setTenantId(deploymentPolicyDefinitionBean.getTenantId()); + } + } + } } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index 1b0d298..adaf9e3 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -358,7 +358,7 @@ public class MockContext { partitionMap.put(tenantId, partitions); } - partitions.put(partition.getId(), partition); + partitions.put(partition.getUuid(), partition); ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed partition"); return stratosApiResponse; http://git-wip-us.apache.org/repos/asf/stratos/blob/1958abd8/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 de344d2..ad9ccbd 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 @@ -586,7 +586,10 @@ public class ObjectConverter { return null; } PartitionBean partition = new PartitionBean(); - partition.setId(stubPartition.getId()); + + partition.setUuid(stubPartition.getUuid()); + partition.setId(stubPartition.getId()); + partition.setTenantId(stubPartition.getTenantId()); partition.setDescription(stubPartition.getDescription()); if (stubPartition.getProperties() != null) { List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList @@ -798,7 +801,7 @@ public class ObjectConverter { List<PartitionReferenceBean> partitionBeans = new ArrayList<PartitionReferenceBean>(); for (PartitionRef partition : partitions) { PartitionReferenceBean partitionBean = new PartitionReferenceBean(); - partitionBean.setId(partition.getId()); + partitionBean.setUuid(partition.getId()); partitionBean.setPartitionMax(partition.getPartitionMax()); partitionBeans.add(partitionBean); } @@ -828,7 +831,7 @@ public class ObjectConverter { return partitionBeans; } - partitionBeans.setId(partition.getId()); + partitionBeans.setUuid(partition.getId()); partitionBeans.setDescription(partition.getDescription()); //properties if (partition.getProperties() != null) { @@ -2171,7 +2174,7 @@ public class ObjectConverter { List<PartitionReferenceBean> partitionRefBeans = new ArrayList<PartitionReferenceBean>(); for (PartitionRef partition : partitions) { PartitionReferenceBean partitionRefBean = new PartitionReferenceBean(); - partitionRefBean.setId(partition.getId()); + partitionRefBean.setUuid(partition.getId()); partitionRefBean.setPartitionMax(partition.getPartitionMax()); partitionRefBeans.add(partitionRefBean); } @@ -2186,7 +2189,9 @@ public class ObjectConverter { } PartitionRef stubPartition = new PartitionRef(); - stubPartition.setId(partitionReferenceBean.getId()); + stubPartition.setUuid(partitionReferenceBean.getUuid()); + stubPartition.setId(partitionReferenceBean.getId()); + stubPartition.setTenantId(partitionReferenceBean.getTenantId()); stubPartition.setPartitionMax(partitionReferenceBean.getPartitionMax()); return stubPartition; }
