You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/11 15:57:07 UTC
stratos git commit: Update kubernetes cluster
Repository: stratos
Updated Branches:
refs/heads/tenant-isolation bb965a53a -> 65c0a762f
Update kubernetes cluster
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/65c0a762
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/65c0a762
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/65c0a762
Branch: refs/heads/tenant-isolation
Commit: 65c0a762f932bf59f09f98b0e07265c4cee72ffb
Parents: bb965a5
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Tue Aug 11 19:26:51 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Tue Aug 11 19:26:51 2015 +0530
----------------------------------------------------------------------
.../services/CloudControllerService.java | 8 ++++----
.../services/impl/CloudControllerServiceImpl.java | 18 +++++++++---------
.../client/CloudControllerServiceClient.java | 4 ++--
.../stratos/rest/endpoint/api/StratosApiV41.java | 4 +++-
.../rest/endpoint/api/StratosApiV41Utils.java | 11 ++++++-----
5 files changed, 24 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/65c0a762/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 9992795..febfb58 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
@@ -329,11 +329,11 @@ public interface CloudControllerService {
/**
* Add a Kubernetes host to a Kubernetes cluster.
*
- * @param groupId
+ * @param groupUuid
* @param kubernetesHost
* @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesHostException
*/
- public boolean addKubernetesHost(String groupId, KubernetesHost kubernetesHost) throws
+ public boolean addKubernetesHost(String groupUuid, KubernetesHost kubernetesHost) throws
InvalidKubernetesHostException,
NonExistingKubernetesClusterException;
@@ -350,10 +350,10 @@ public interface CloudControllerService {
/**
* Remove a Kubernetes host.
*
- * @param groupId
+ * @param groupUuid
* @throws NonExistingKubernetesClusterException
*/
- public boolean removeKubernetesCluster(String groupId) throws NonExistingKubernetesClusterException;
+ public boolean removeKubernetesCluster(String groupUuid) throws NonExistingKubernetesClusterException;
/**
* Update a Kubernetes host.
http://git-wip-us.apache.org/repos/asf/stratos/blob/65c0a762/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 a5d761e..81258e2 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
@@ -1303,12 +1303,12 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public boolean addKubernetesHost(String kubernetesClusterId, KubernetesHost kubernetesHost) throws
+ public boolean addKubernetesHost(String groupUuid, KubernetesHost kubernetesHost) throws
InvalidKubernetesHostException, NonExistingKubernetesClusterException {
if (kubernetesHost == null) {
throw new InvalidKubernetesHostException("Kubernetes host cannot be null");
}
- if (StringUtils.isEmpty(kubernetesClusterId)) {
+ if (StringUtils.isEmpty(groupUuid)) {
throw new NonExistingKubernetesClusterException("Kubernetes cluster id cannot be null");
}
@@ -1318,11 +1318,11 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (log.isInfoEnabled()) {
log.info(String.format("Adding kubernetes host for kubernetes cluster: [kubernetes-cluster-id] %s " +
- "[hostname] %s", kubernetesClusterId, kubernetesHost.getHostname()));
+ "[hostname] %s", groupUuid, kubernetesHost.getHostname()));
}
CloudControllerUtil.validateKubernetesHost(kubernetesHost);
- KubernetesCluster kubernetesCluster = getKubernetesCluster(kubernetesClusterId);
+ KubernetesCluster kubernetesCluster = getKubernetesCluster(groupUuid);
ArrayList<KubernetesHost> kubernetesHostArrayList;
if (kubernetesCluster.getKubernetesHosts() == null) {
@@ -1357,8 +1357,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public boolean removeKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException {
- if (StringUtils.isEmpty(kubernetesClusterId)) {
+ public boolean removeKubernetesCluster(String groupUuid) throws NonExistingKubernetesClusterException {
+ if (StringUtils.isEmpty(groupUuid)) {
throw new NonExistingKubernetesClusterException("Kubernetes cluster id cannot be empty");
}
@@ -1367,13 +1367,13 @@ public class CloudControllerServiceImpl implements CloudControllerService {
lock = CloudControllerContext.getInstance().acquireKubernetesClusterWriteLock();
if (log.isInfoEnabled()) {
- log.info("Removing Kubernetes cluster: " + kubernetesClusterId);
+ log.info("Removing Kubernetes cluster: " + groupUuid);
}
// Remove entry from information model
- CloudControllerContext.getInstance().removeKubernetesCluster(kubernetesClusterId);
+ CloudControllerContext.getInstance().removeKubernetesCluster(groupUuid);
if (log.isInfoEnabled()) {
- log.info(String.format("Kubernetes cluster removed successfully: [id] %s", kubernetesClusterId));
+ log.info(String.format("Kubernetes cluster removed successfully: [id] %s", groupUuid));
}
CloudControllerContext.getInstance().persist();
http://git-wip-us.apache.org/repos/asf/stratos/blob/65c0a762/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 dea1e3a..bc1f939 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
@@ -147,11 +147,11 @@ public class CloudControllerServiceClient {
return stub.addKubernetesCluster(kubernetesCluster);
}
- public boolean addKubernetesHost(String kubernetesClusterId, KubernetesHost kubernetesHost)
+ public boolean addKubernetesHost(String kubernetesClusterUuid, KubernetesHost kubernetesHost)
throws RemoteException, CloudControllerServiceInvalidKubernetesHostExceptionException,
CloudControllerServiceNonExistingKubernetesClusterExceptionException {
- return stub.addKubernetesHost(kubernetesClusterId, kubernetesHost);
+ return stub.addKubernetesHost(kubernetesClusterUuid, kubernetesHost);
}
public boolean updateKubernetesMaster(KubernetesMaster kubernetesMaster) throws RemoteException,
http://git-wip-us.apache.org/repos/asf/stratos/blob/65c0a762/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 7ca3070..fe5dc83 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
@@ -2141,7 +2141,8 @@ public class StratosApiV41 extends AbstractApi {
public Response removeKubernetesHostCluster(
@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException {
try {
- StratosApiV41Utils.removeKubernetesCluster(kubernetesClusterId);
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ StratosApiV41Utils.removeKubernetesCluster(kubernetesClusterId,carbonContext.getTenantId());
} catch (CloudControllerServiceNonExistingKubernetesClusterExceptionException e) {
return Response.status(Response.Status.NOT_FOUND)
.entity(new ResponseMessageBean(ResponseMessageBean.ERROR,
@@ -2169,6 +2170,7 @@ public class StratosApiV41 extends AbstractApi {
public Response removeKubernetesHostOfKubernetesCluster(
@PathParam("hostId") String kubernetesHostId) throws RestAPIException {
try {
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
StratosApiV41Utils.removeKubernetesHost(kubernetesHostId);
} catch (RestAPIException e) {
return Response.status(Response.Status.NOT_FOUND).entity(new ResponseMessageBean(
http://git-wip-us.apache.org/repos/asf/stratos/blob/65c0a762/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 5c9ab69..5f67dd4 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
@@ -2222,9 +2222,9 @@ public class StratosApiV41Utils {
if (cloudControllerServiceClient != null) {
org.apache.stratos.cloud.controller.stub.domain.kubernetes.KubernetesHost kubernetesHost =
ObjectConverter.convertKubernetesHostToStubKubernetesHost(kubernetesHostBean,tenantId);
-
try {
- return cloudControllerServiceClient.addKubernetesHost(kubernetesClusterId, kubernetesHost);
+ KubernetesCluster kubernetesCluster=cloudControllerServiceClient.getKubernetesClusterByTenantId(kubernetesClusterId, tenantId);
+ return cloudControllerServiceClient.addKubernetesHost(kubernetesCluster.getClusterUuid(), kubernetesHost);
} catch (RemoteException e) {
log.error(e.getMessage(), e);
throw new RestAPIException(e.getMessage(), e);
@@ -2337,14 +2337,15 @@ public class StratosApiV41Utils {
* @return remove status
* @throws RestAPIException
*/
- public static boolean removeKubernetesCluster(String kubernetesClusterId) throws RestAPIException,
+ public static boolean removeKubernetesCluster(String kubernetesClusterId,int tenantId) throws RestAPIException,
CloudControllerServiceNonExistingKubernetesClusterExceptionException {
-
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
try {
- cloudControllerServiceClient.undeployKubernetesCluster(kubernetesClusterId);
+ KubernetesCluster kubernetesCluster=cloudControllerServiceClient.getKubernetesClusterByTenantId(kubernetesClusterId, tenantId);
+ cloudControllerServiceClient.undeployKubernetesCluster(kubernetesCluster.getClusterUuid());
} catch (RemoteException e) {
log.error(e.getMessage(), e);