Repository: stratos Updated Branches: refs/heads/master 169909a57 -> 57099f61d
Minor refactoring in REST API and CC client Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cbc1b375 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cbc1b375 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cbc1b375 Branch: refs/heads/master Commit: cbc1b3751251488bd59fc7c79eb12d6fca0cd83d Parents: 169909a Author: Chamila de Alwis <cham...@apache.org> Authored: Mon Apr 13 23:24:17 2015 +0530 Committer: Chamila de Alwis <cham...@apache.org> Committed: Mon Apr 13 23:24:25 2015 +0530 ---------------------------------------------------------------------- .../controller/services/impl/CloudControllerServiceImpl.java | 7 ++++--- .../stratos/common/client/CloudControllerServiceClient.java | 2 +- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1b375/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 2f5c8c9..2a07199 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 @@ -1377,10 +1377,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { try { KubernetesCluster kubernetesClusterStored = CloudControllerContext.getInstance().getKubernetesClusterContainingHost(kubernetesHost.getHostId()); - for (int i = 0; i < kubernetesClusterStored.getKubernetesHosts().length; i++) { - if (kubernetesClusterStored.getKubernetesHosts()[i].getHostId().equals(kubernetesHost.getHostId())) { + KubernetesHost[] kubernetesHosts = kubernetesClusterStored.getKubernetesHosts(); + for (int i = 0; i < kubernetesHosts.length; i++) { + if (kubernetesHosts[i].getHostId().equals(kubernetesHost.getHostId())) { // Update the information model - kubernetesClusterStored.getKubernetesHosts()[i] = kubernetesHost; + kubernetesHosts[i] = kubernetesHost; if (log.isInfoEnabled()) { log.info(String.format("Kubernetes host updated successfully: [id] %s", kubernetesHost.getHostId())); http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1b375/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 313775f..cb19041 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 @@ -164,7 +164,7 @@ public class CloudControllerServiceClient { return stub.addKubernetesCluster(kubernetesCluster); } - public boolean deployKubernetesHost(String kubernetesClusterId, KubernetesHost kubernetesHost) + public boolean addKubernetesHost(String kubernetesClusterId, KubernetesHost kubernetesHost) throws RemoteException, CloudControllerServiceInvalidKubernetesHostExceptionException, CloudControllerServiceNonExistingKubernetesClusterExceptionException { http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1b375/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 c716bd7..225382b 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 @@ -1504,7 +1504,7 @@ public class StratosApiV41Utils { ObjectConverter.convertKubernetesHostToStubKubernetesHost(kubernetesHostBean); try { - return cloudControllerServiceClient.deployKubernetesHost(kubernetesClusterId, kubernetesHost); + return cloudControllerServiceClient.addKubernetesHost(kubernetesClusterId, kubernetesHost); } catch (RemoteException e) { log.error(e.getMessage(), e); throw new RestAPIException(e.getMessage(), e);
