Repository: stratos Updated Branches: refs/heads/stratos-4.1.x b95f3c277 -> 54c961d5f
Update accessurl as a map against instanceclusterid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/54c961d5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/54c961d5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/54c961d5 Branch: refs/heads/stratos-4.1.x Commit: 54c961d5f962996e854de7dddf2bf60769d3bab4 Parents: b95f3c2 Author: gayangunarathne <[email protected]> Authored: Tue Sep 22 19:49:35 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Wed Sep 23 15:16:09 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, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/54c961d5/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 e94bb52..6aca2ad 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); - cluster.addAccessUrl(accessURL.toString()); + kubernetesService.setAccessUrl(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/54c961d5/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 a7d967d..3e66344 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,6 +33,7 @@ public class KubernetesServiceBean { private String protocol; private int port; private int containerPort; + private String accessUrl; public String getId() { return id; @@ -81,4 +82,12 @@ 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/54c961d5/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 abac376..6598f0d 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,6 +37,7 @@ public class KubernetesService implements Serializable { private String serviceType; private String portName; private String kubernetesClusterId; + private String accessUrl; public String getPortName() { return portName; @@ -108,4 +109,12 @@ 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/54c961d5/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 07a95ac..5f110a7 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,7 +48,6 @@ 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; @@ -717,7 +716,15 @@ public class ObjectConverter { clusterInstanceBean.getMember().add(memberBean); } } - clusterInstanceBean.setAccessUrls(cluster.getAccessUrls()); + + 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); + } for (String hostname : cluster.getHostNames()) { clusterInstanceBean.getHostNames().add(hostname); } @@ -754,6 +761,7 @@ public class ObjectConverter { kubernetesServiceBean.setProtocol(kubernetesService.getProtocol()); kubernetesServiceBean.setPort(kubernetesService.getPort()); kubernetesServiceBean.setContainerPort(kubernetesService.getContainerPort()); + kubernetesServiceBean.setAccessUrl(kubernetesService.getAccessUrl()); kubernetesServiceBeans.add(kubernetesServiceBean); }
