Removing UUID and tenantId from PartitionBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/db987078 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/db987078 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/db987078 Branch: refs/heads/tenant-isolation Commit: db987078c6d55f725014804946baf79946405fd1 Parents: 96900b8 Author: Dinithi <[email protected]> Authored: Wed Aug 19 10:26:34 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Aug 19 10:26:34 2015 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 5 + .../common/beans/partition/PartitionBean.java | 17 - .../client/CloudControllerServiceClient.java | 4 + .../rest/endpoint/api/StratosApiV41Utils.java | 21 +- .../stratos/rest/endpoint/mock/MockContext.java | 2 +- .../util/converter/ObjectConverter.java | 23 +- .../main/resources/CloudControllerService.wsdl | 710 ++++++++++--------- 7 files changed, 414 insertions(+), 368 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/db987078/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 3fdac00..81734e1 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 @@ -1754,6 +1754,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } + public Partition[] getPartitionsByNetworkPartition(String networkPartitionId, int tenantId) { + NetworkPartition networkPartition = getNetworkPartitionByTenant(networkPartitionId, tenantId); + return networkPartition.getPartitions(); + } + @Override public String[] getIaasProviders() { http://git-wip-us.apache.org/repos/asf/stratos/blob/db987078/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 d5c5802..4be030c 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 @@ -31,15 +31,6 @@ public class PartitionBean { private String id; private String description; private List<PropertyBean> property; - private int tenantId; - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } public String getDescription() { return description; @@ -64,12 +55,4 @@ public class PartitionBean { 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/db987078/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index 2be0136..cae2406 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -235,6 +235,10 @@ public class CloudControllerServiceClient { return stub.getNetworkPartition(networkPartitionId); } + public Partition[] getPartitionsByNetworkPartition(String networkPartitionId, int tenantId) throws RemoteException { + return stub.getPartitionsByNetworkPartition(networkPartitionId, tenantId); + } + public void createClusterInstance(String serviceUuid, String clusterId, String alias, String instanceId, String partitionId, String networkPartitionUuid) throws RemoteException { http://git-wip-us.apache.org/repos/asf/stratos/blob/db987078/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 fe56191..f58fbdd 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 @@ -32,6 +32,7 @@ import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.domain.Cartridge; import org.apache.stratos.cloud.controller.stub.domain.NetworkPartition; +import org.apache.stratos.cloud.controller.stub.domain.Partition; import org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesCluster; import org.apache.stratos.common.beans.IaasProviderInfoBean; import org.apache.stratos.common.beans.PropertyBean; @@ -50,7 +51,6 @@ 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; @@ -3013,16 +3013,19 @@ public class StratosApiV41Utils { throw new RestAPIException(message); } + Partition[] partitions = CloudControllerServiceClient.getInstance().getPartitionsByNetworkPartition + (networkPartitionReferenceBean.getId(), tenantId); + for (NetworkPartitionBean networkPartitionBean : networkPartitions) { if (networkPartition.getTenantId() == tenantId && networkPartitionBean.getId().equals (networkPartitionReferenceBean.getId())) { networkPartitionReferenceBean.setUuid(networkPartition.getUuid()); - for (PartitionReferenceBean partition : networkPartitionReferenceBean.getPartitions()) { - for (PartitionBean existingPartition : networkPartitionBean.getPartitions()) { - if (existingPartition.getTenantId() == tenantId && - partition.getId().equals(existingPartition.getId())) { - partition.setUuid(existingPartition.getUuid()); - partition.setTenantId(tenantId); + for (PartitionReferenceBean partitionReferenceBean : networkPartitionReferenceBean.getPartitions()) { + for (Partition partition : partitions) { + if (partition.getTenantId() == tenantId && + partitionReferenceBean.getId().equals(partition.getId())) { + partitionReferenceBean.setUuid(partition.getUuid()); + partitionReferenceBean.setTenantId(tenantId); } } } @@ -3125,7 +3128,9 @@ public class StratosApiV41Utils { (networkPartitionReferenceBean.getId())) { networkPartitionReferenceBean.setUuid(networkPartition.getUuid()); for (PartitionReferenceBean partition : networkPartitionReferenceBean.getPartitions()) { - for (PartitionBean existingPartition : networkPartitionBean.getPartitions()) { + for (Partition existingPartition : CloudControllerServiceClient + .getInstance().getPartitionsByNetworkPartition(networkPartitionReferenceBean + .getId(), tenantId)) { if (existingPartition.getTenantId() == tenantId && partition.getId().equals(existingPartition.getId())) { partition.setUuid(existingPartition.getUuid()); http://git-wip-us.apache.org/repos/asf/stratos/blob/db987078/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 adaf9e3..1b0d298 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.getUuid(), partition); + partitions.put(partition.getId(), partition); ResponseMessageBean stratosApiResponse = new ResponseMessageBean(); stratosApiResponse.setMessage("Successfully deployed partition"); return stratosApiResponse; http://git-wip-us.apache.org/repos/asf/stratos/blob/db987078/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 03f14d3..3691b5d 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 @@ -582,12 +582,10 @@ public class ObjectConverter { if (stubPartition == null) { return null; } - PartitionBean partition = new PartitionBean(); + PartitionBean partitionBean = new PartitionBean(); - partition.setUuid(stubPartition.getUuid()); - partition.setId(stubPartition.getId()); - partition.setTenantId(stubPartition.getTenantId()); - partition.setDescription(stubPartition.getDescription()); + partitionBean.setId(stubPartition.getId()); + partitionBean.setDescription(stubPartition.getDescription()); if (stubPartition.getProperties() != null) { List<org.apache.stratos.common.beans.PropertyBean> propertyBeanList = new ArrayList<org.apache.stratos.common.beans.PropertyBean>(); @@ -599,9 +597,9 @@ public class ObjectConverter { } } } - partition.setProperty(propertyBeanList); + partitionBean.setProperty(propertyBeanList); } - return partition; + return partitionBean; } @@ -825,20 +823,19 @@ public class ObjectConverter { public static PartitionBean populatePartitionPojo(org.apache.stratos.cloud.controller.stub.domain.Partition partition) { - PartitionBean partitionBeans = new PartitionBean(); + PartitionBean partitionBean = new PartitionBean(); if (partition == null) { - return partitionBeans; + return partitionBean; } - partitionBeans.setUuid(partition.getId()); - partitionBeans.setDescription(partition.getDescription()); + partitionBean.setDescription(partition.getDescription()); //properties if (partition.getProperties() != null) { List<org.apache.stratos.common.beans.PropertyBean> propertyBeans = convertCCStubPropertiesToPropertyBeans(partition.getProperties()); - partitionBeans.setProperty(propertyBeans); + partitionBean.setProperty(propertyBeans); } - return partitionBeans; + return partitionBean; } private static List<org.apache.stratos.common.beans.PropertyBean> convertJavaUtilPropertiesToPropertyBeans(
