Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 54c961d5f -> 13bd7dca7
Revert "Update accessurl as a map against instanceclusterid" This reverts commit 54c961d5f962996e854de7dddf2bf60769d3bab4. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/13bd7dca Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/13bd7dca Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/13bd7dca Branch: refs/heads/stratos-4.1.x Commit: 13bd7dca7764749e456611be6443f5490dd18b1f Parents: 54c961d Author: gayangunarathne <[email protected]> Authored: Wed Sep 23 16:50:24 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Wed Sep 23 16:50:24 2015 +0530 ---------------------------------------------------------------------- .../controller/messaging/topology/TopologyBuilder.java | 2 +- .../common/beans/kubernetes/KubernetesServiceBean.java | 9 --------- .../messaging/domain/topology/KubernetesService.java | 9 --------- .../rest/endpoint/util/converter/ObjectConverter.java | 12 ++---------- 4 files changed, 3 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/13bd7dca/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index 6aca2ad..e94bb52 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -870,7 +870,7 @@ public class TopologyBuilder { // Using type URI since only http, https, ftp, file, jar protocols are supported in URL URI accessURL = new URI(kubernetesService.getProtocol(), null, publicIP, kubernetesService.getPort(), null, null, null); - kubernetesService.setAccessUrl(accessURL.toString()); + cluster.addAccessUrl(accessURL.toString()); clusterInstanceActivatedEvent.addAccessUrl(accessURL.toString()); } else { log.error(String.format("Could not create access URL for [Kubernetes-service] %s , " + http://git-wip-us.apache.org/repos/asf/stratos/blob/13bd7dca/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesServiceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesServiceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesServiceBean.java index 3e66344..a7d967d 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesServiceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesServiceBean.java @@ -33,7 +33,6 @@ public class KubernetesServiceBean { private String protocol; private int port; private int containerPort; - private String accessUrl; public String getId() { return id; @@ -82,12 +81,4 @@ public class KubernetesServiceBean { public int getContainerPort() { return containerPort; } - - public String getAccessUrl() { - return accessUrl; - } - - public void setAccessUrl(String accessUrl) { - this.accessUrl = accessUrl; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/13bd7dca/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java index 6598f0d..abac376 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java @@ -37,7 +37,6 @@ public class KubernetesService implements Serializable { private String serviceType; private String portName; private String kubernetesClusterId; - private String accessUrl; public String getPortName() { return portName; @@ -109,12 +108,4 @@ public class KubernetesService implements Serializable { public void setKubernetesClusterId(String kubernetesClusterId) { this.kubernetesClusterId = kubernetesClusterId; } - - public String getAccessUrl() { - return accessUrl; - } - - public void setAccessUrl(String accessUrl) { - this.accessUrl = accessUrl; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/13bd7dca/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 5f110a7..07a95ac 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 @@ -48,6 +48,7 @@ import org.apache.stratos.manager.service.stub.domain.application.signup.Applica import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository; import org.apache.stratos.manager.service.stub.domain.application.signup.DomainMapping; import org.apache.stratos.messaging.domain.application.Application; +import org.apache.stratos.messaging.domain.application.ApplicationStatus; import org.apache.stratos.messaging.domain.application.Group; import org.apache.stratos.messaging.domain.instance.ApplicationInstance; import org.apache.stratos.messaging.domain.instance.ClusterInstance; @@ -716,15 +717,7 @@ public class ObjectConverter { clusterInstanceBean.getMember().add(memberBean); } } - - List<String> accessUrls=new LinkedList<>(); - List<KubernetesServiceBean> kubServices=clusterInstanceBean.getKubernetesServices(); - if(kubServices!=null) { - for (int i = 0; i < kubServices.size(); i++) { - accessUrls.add(kubServices.get(i).getAccessUrl()); - } - clusterInstanceBean.setAccessUrls(accessUrls); - } + clusterInstanceBean.setAccessUrls(cluster.getAccessUrls()); for (String hostname : cluster.getHostNames()) { clusterInstanceBean.getHostNames().add(hostname); } @@ -761,7 +754,6 @@ public class ObjectConverter { kubernetesServiceBean.setProtocol(kubernetesService.getProtocol()); kubernetesServiceBean.setPort(kubernetesService.getPort()); kubernetesServiceBean.setContainerPort(kubernetesService.getContainerPort()); - kubernetesServiceBean.setAccessUrl(kubernetesService.getAccessUrl()); kubernetesServiceBeans.add(kubernetesServiceBean); }
