Update get kuberenetes cluster with tenant Id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dd6aedea Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dd6aedea Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dd6aedea Branch: refs/heads/tenant-isolation Commit: dd6aedea3d530f3dc081e32d4e556eabad5878ef Parents: 65c0a76 Author: Gayan Gunarathne <[email protected]> Authored: Tue Aug 11 20:28:53 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Aug 11 20:28:53 2015 +0530 ---------------------------------------------------------------------- .../services/CloudControllerService.java | 2 +- .../impl/CloudControllerServiceImpl.java | 14 +- .../client/CloudControllerServiceClient.java | 4 +- .../rest/endpoint/api/StratosApiV41.java | 3 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../main/resources/CloudControllerService.wsdl | 1010 +++++++++--------- 6 files changed, 524 insertions(+), 513 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dd6aedea/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index febfb58..68b85b2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -272,7 +272,7 @@ public interface CloudControllerService { /** * Retrieves registered Kubernetes clusters. */ - public KubernetesCluster[] getKubernetesClusters(); + public KubernetesCluster[] getKubernetesClusters(int tenantId); /** * Retrieves Kubernetes cluster for given Kubernetes cluster UUID. http://git-wip-us.apache.org/repos/asf/stratos/blob/dd6aedea/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 81258e2..6e93e53 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 @@ -1194,8 +1194,16 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public KubernetesCluster[] getKubernetesClusters() { - return CloudControllerContext.getInstance().getKubernetesClusters(); + public KubernetesCluster[] getKubernetesClusters(int tenantId) { + KubernetesCluster[] kubernetesClusters=CloudControllerContext.getInstance().getKubernetesClusters(); + List<KubernetesCluster> kubernetesClusterList = new ArrayList<KubernetesCluster>(); + for(int i=0;i<kubernetesClusters.length;i++){ + if(kubernetesClusters[i].getTenantId()==tenantId){ + kubernetesClusterList.add(kubernetesClusters[i]); + } + } + return kubernetesClusterList.toArray(new KubernetesCluster[kubernetesClusterList.size()]); + } @Override @@ -1207,7 +1215,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { @Override public KubernetesCluster getKubernetesClusterByTenant(String kubernetesClusterId,int tenantId) throws NonExistingKubernetesClusterException { - for(KubernetesCluster kubernetesCluster:getKubernetesClusters()){ + for(KubernetesCluster kubernetesCluster:getKubernetesClusters(tenantId)){ if(kubernetesCluster.getClusterId().equals(kubernetesClusterId)&&kubernetesCluster.getTenantId()==tenantId){ return kubernetesCluster; } http://git-wip-us.apache.org/repos/asf/stratos/blob/dd6aedea/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 bc1f939..2be0136 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 @@ -160,8 +160,8 @@ public class CloudControllerServiceClient { return stub.updateKubernetesMaster(kubernetesMaster); } - public KubernetesCluster[] getAvailableKubernetesClusters() throws RemoteException { - return stub.getKubernetesClusters(); + public KubernetesCluster[] getAvailableKubernetesClusters(int tenantId) throws RemoteException { + return stub.getKubernetesClusters(tenantId); } public KubernetesCluster getKubernetesCluster(String kubernetesClusterId) throws RemoteException, http://git-wip-us.apache.org/repos/asf/stratos/blob/dd6aedea/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 fe5dc83..14f97f5 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 @@ -2052,7 +2052,8 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @AuthorizationAction("/permission/admin/stratos/kubernetesClusters/view") public Response getKubernetesHostClusters() throws RestAPIException { - KubernetesClusterBean[] availableKubernetesClusters = StratosApiV41Utils.getAvailableKubernetesClusters(); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + KubernetesClusterBean[] availableKubernetesClusters = StratosApiV41Utils.getAvailableKubernetesClusters(carbonContext.getTenantId()); if (availableKubernetesClusters == null || availableKubernetesClusters.length == 0) { return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "No kubernetes clusters found")).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/dd6aedea/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 5f67dd4..6ff440f 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 @@ -2279,13 +2279,13 @@ public class StratosApiV41Utils { * @return Array of KubernetesClusterBeans * @throws RestAPIException */ - public static KubernetesClusterBean[] getAvailableKubernetesClusters() throws RestAPIException { + public static KubernetesClusterBean[] getAvailableKubernetesClusters(int tenantId) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { try { org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesCluster[] - kubernetesClusters = cloudControllerServiceClient.getAvailableKubernetesClusters(); + kubernetesClusters = cloudControllerServiceClient.getAvailableKubernetesClusters(tenantId); if (kubernetesClusters == null) { if (log.isDebugEnabled()) { log.debug("There are no available Kubernetes clusters");
