Remove UUID and tenantId from PartitionReferenceBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/98b77446 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/98b77446 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/98b77446 Branch: refs/heads/tenant-isolation Commit: 98b77446f1b4622ca250092334213a053f562c44 Parents: db98707 Author: Dinithi <[email protected]> Authored: Wed Aug 19 11:16:54 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Aug 19 11:16:54 2015 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 5 + .../NetworkPartitionReferenceBean.java | 18 - .../client/CloudControllerServiceClient.java | 4 + .../rest/endpoint/api/StratosApiV41.java | 7 - .../rest/endpoint/api/StratosApiV41Utils.java | 2 - .../util/converter/ObjectConverter.java | 12 +- .../main/resources/CloudControllerService.wsdl | 1048 +++++++++--------- 7 files changed, 566 insertions(+), 530 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/98b77446/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 81734e1..316984a 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 String getNetworkPartitionUuid(String networkPartitionId, int tenantId) { + NetworkPartition networkPartition = getNetworkPartitionByTenant(networkPartitionId, tenantId); + return networkPartition.getUuid(); + } + public Partition[] getPartitionsByNetworkPartition(String networkPartitionId, int tenantId) { NetworkPartition networkPartition = getNetworkPartitionByTenant(networkPartitionId, tenantId); return networkPartition.getPartitions(); http://git-wip-us.apache.org/repos/asf/stratos/blob/98b77446/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java index a5712f4..c593ee4 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java @@ -26,8 +26,6 @@ import java.util.List; public class NetworkPartitionReferenceBean { private String id; - private String uuid; - private int tenantId; private String provider; private List<PartitionReferenceBean> partitions; private String partitionAlgo; @@ -40,22 +38,6 @@ public class NetworkPartitionReferenceBean { this.id = id; } - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public int getTenantId() { - return tenantId; - } - - public void setTenantId(int tenantId) { - this.tenantId = tenantId; - } - public List<PartitionReferenceBean> getPartitions() { return partitions; } http://git-wip-us.apache.org/repos/asf/stratos/blob/98b77446/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 cae2406..b0784f3 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 @@ -239,6 +239,10 @@ public class CloudControllerServiceClient { return stub.getPartitionsByNetworkPartition(networkPartitionId, tenantId); } + public String getNetworkPartitionUuid(String networkPartitionId, int tenantId) throws RemoteException { + return stub.getNetworkPartitionUuid(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/98b77446/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index c0f03b7..ff1c4a8 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -40,7 +40,6 @@ import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean; 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.policy.autoscale.AutoscalePolicyBean; import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean; import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean; @@ -143,12 +142,6 @@ public class StratosApiV41 extends AbstractApi { PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); int tenantId = carbonContext.getTenantId(); - List<NetworkPartitionReferenceBean> networkPartitionReferenceBeans = deploymentPolicyDefinitionBean - .getNetworkPartitions(); - for (NetworkPartitionReferenceBean networkPartitionReferenceBeans1 : networkPartitionReferenceBeans) { - networkPartitionReferenceBeans1.setTenantId(tenantId); - } - try { StratosApiV41Utils.addDeploymentPolicy(deploymentPolicyDefinitionBean, deploymentPolicyUuid, tenantId); } catch (AutoscalerServiceInvalidDeploymentPolicyExceptionException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/98b77446/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 f58fbdd..37fa158 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 @@ -3019,7 +3019,6 @@ public class StratosApiV41Utils { for (NetworkPartitionBean networkPartitionBean : networkPartitions) { if (networkPartition.getTenantId() == tenantId && networkPartitionBean.getId().equals (networkPartitionReferenceBean.getId())) { - networkPartitionReferenceBean.setUuid(networkPartition.getUuid()); for (PartitionReferenceBean partitionReferenceBean : networkPartitionReferenceBean.getPartitions()) { for (Partition partition : partitions) { if (partition.getTenantId() == tenantId && @@ -3126,7 +3125,6 @@ public class StratosApiV41Utils { for (NetworkPartitionBean networkPartitionBean : networkPartitions) { if (networkPartition.getTenantId() == tenantId && networkPartitionBean.getId().equals (networkPartitionReferenceBean.getId())) { - networkPartitionReferenceBean.setUuid(networkPartition.getUuid()); for (PartitionReferenceBean partition : networkPartitionReferenceBean.getPartitions()) { for (Partition existingPartition : CloudControllerServiceClient .getInstance().getPartitionsByNetworkPartition(networkPartitionReferenceBean http://git-wip-us.apache.org/repos/asf/stratos/blob/98b77446/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 3691b5d..02d2c3a 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 @@ -62,6 +62,7 @@ import org.apache.stratos.messaging.domain.topology.Port; import org.apache.stratos.rest.endpoint.api.StratosApiV41Utils; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import org.apache.stratos.rest.endpoint.exception.ServiceGroupDefinitionException; +import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.stratos.common.beans.TenantInfoBean; import java.rmi.RemoteException; @@ -630,7 +631,6 @@ public class ObjectConverter { for (NetworkPartitionRef networkPartitionRef : networkPartitions) { NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean(); networkPartitionReferenceBean.setId(networkPartitionRef.getId()); - networkPartitionReferenceBean.setUuid(networkPartitionRef.getUuid()); networkPartitionReferenceBean.setPartitionAlgo(networkPartitionRef.getPartitionAlgo()); networkPartitionReferenceBean.setPartitions( convertASStubPartitionsToPartitions(networkPartitionRef.getPartitionRefs())); @@ -2092,7 +2092,7 @@ public class ObjectConverter { public static DeploymentPolicy convertDeploymentPolicyBeanToASDeploymentPolicy( - DeploymentPolicyBean deploymentPolicyBean, String deploymentPolicyUuid, int tenantId) { + DeploymentPolicyBean deploymentPolicyBean, String deploymentPolicyUuid, int tenantId) throws RemoteException { if (deploymentPolicyBean == null) { return null; @@ -2147,7 +2147,6 @@ public class ObjectConverter { for (NetworkPartitionRef networkPartition : networkPartitions) { NetworkPartitionReferenceBean networkPartitionReferenceBean = new NetworkPartitionReferenceBean(); networkPartitionReferenceBean.setId(networkPartition.getId()); - networkPartitionReferenceBean.setUuid(networkPartition.getUuid()); networkPartitionReferenceBean.setPartitionAlgo(networkPartition.getPartitionAlgo()); networkPartitionReferenceBean.setPartitions( convertASStubPartitionRefsToPartitionReferences(networkPartition.getPartitionRefs())); @@ -2200,14 +2199,17 @@ public class ObjectConverter { private static NetworkPartitionRef[] convertNetworkPartitionToASStubNetworkPartition( - List<NetworkPartitionReferenceBean> networkPartitionReferenceBeans) { + List<NetworkPartitionReferenceBean> networkPartitionReferenceBeans) throws RemoteException { List<NetworkPartitionRef> networkPartitionRefList = new ArrayList<NetworkPartitionRef>(); for (NetworkPartitionReferenceBean networkPartitionReferenceBean : networkPartitionReferenceBeans) { NetworkPartitionRef networkPartitionRef = new NetworkPartitionRef(); networkPartitionRef.setId(networkPartitionReferenceBean.getId()); - networkPartitionRef.setUuid(networkPartitionReferenceBean.getUuid()); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + String networkPartitionUuid = CloudControllerServiceClient.getInstance().getNetworkPartitionUuid + (networkPartitionReferenceBean.getId(), carbonContext.getTenantId()); + networkPartitionRef.setUuid(networkPartitionUuid); networkPartitionRef.setPartitionAlgo(networkPartitionReferenceBean.getPartitionAlgo()); if (networkPartitionReferenceBean.getPartitions() != null) { networkPartitionRef.setPartitionRefs(convertToASStubPartitions(
