Repository: stratos Updated Branches: refs/heads/stratos-4.1.x c646d2d23 -> d9fcd85ff
Revert "Update accessurl as a map against instanceclusterid" This reverts commit c646d2d23773cfdcd5252874289765a3ec7eaab2. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d9fcd85f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d9fcd85f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d9fcd85f Branch: refs/heads/stratos-4.1.x Commit: d9fcd85ff9d08ab40cc92ee3d2efd3a348b35800 Parents: c646d2d Author: gayangunarathne <[email protected]> Authored: Tue Sep 22 10:30:41 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Tue Sep 22 10:30:41 2015 +0530 ---------------------------------------------------------------------- .../messaging/topology/TopologyBuilder.java | 5 ++-- .../impl/CloudControllerServiceImpl.java | 2 +- .../messaging/domain/topology/Cluster.java | 31 +++++++------------- .../topology/ClusterInstanceActivatedEvent.java | 24 +++++++-------- .../ClusterInstanceActivatedProcessor.java | 10 +++---- .../util/converter/ObjectConverter.java | 3 +- 6 files changed, 32 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d9fcd85f/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 59c5a03..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,9 +870,8 @@ 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(clusterInstanceActivatedEvent.getInstanceId(),accessURL.toString()); - - clusterInstanceActivatedEvent.addAccessUrl(clusterInstanceActivatedEvent.getInstanceId(),accessURL.toString()); + cluster.addAccessUrl(accessURL.toString()); + clusterInstanceActivatedEvent.addAccessUrl(accessURL.toString()); } else { log.error(String.format("Could not create access URL for [Kubernetes-service] %s , " + "since Public IP is not available", kubernetesService.getId())); http://git-wip-us.apache.org/repos/asf/stratos/blob/d9fcd85f/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 a8adbcc..f1615c5 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 @@ -1101,7 +1101,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { cluster.setLbCluster(false); cluster.setTenantRange(appClusterCtxt.getTenantRange()); cluster.setHostNames(Arrays.asList(appClusterCtxt.getHostName())); - cluster.setAccessUrlsMap(accessUrls); + cluster.setAccessUrls(accessUrls.get(appClusterCtxt.getClusterId())); if (appClusterCtxt.getProperties() != null) { Properties properties = CloudControllerUtil.toJavaUtilProperties(appClusterCtxt.getProperties()); http://git-wip-us.apache.org/repos/asf/stratos/blob/d9fcd85f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java index 49b3829..b734499 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java @@ -61,7 +61,7 @@ public class Cluster implements Serializable { private Properties properties; private Map<String, ClusterInstance> instanceIdToInstanceContextMap; //private LifeCycleStateManager<ClusterStatus> clusterStateManager; - private Map<String,List<String>> accessUrls; + private List<String> accessUrls; private List<KubernetesService> kubernetesServices; public Cluster(Cluster cluster) { @@ -79,7 +79,7 @@ public class Cluster implements Serializable { this.tenantRange = cluster.getTenantRange(); this.setLbCluster(cluster.isLbCluster()); this.setKubernetesCluster(cluster.isKubernetesCluster()); - this.accessUrls = cluster.getAccessUrlsMap(); + this.accessUrls = cluster.getAccessUrls(); this.kubernetesServices = cluster.getKubernetesServices(); } @@ -93,7 +93,7 @@ public class Cluster implements Serializable { this.memberMap = new ConcurrentHashMap<String, Member>(); this.appId = appId; this.setInstanceIdToInstanceContextMap(new ConcurrentHashMap<String, ClusterInstance>()); - this.accessUrls = new HashMap<>(); + this.accessUrls = new ArrayList<String>(); this.kubernetesServices = new ArrayList<KubernetesService>(); } @@ -334,29 +334,20 @@ public class Cluster implements Serializable { return this.instanceIdToInstanceContextMap.values(); } - public Map<String,List<String>> getAccessUrlsMap() { + public List<String> getAccessUrls() { return accessUrls; } - public List<String> getAccessUrls(String clusterInstanceId) { - return accessUrls.get(clusterInstanceId); + public void setAccessUrls(List<String> accessUrls) { + this.accessUrls = accessUrls; } - public void setAccessUrls(String instanceClusterId,List<String> accessUrlSet) { - this.accessUrls.put(instanceClusterId, accessUrlSet); - } - - public void setAccessUrlsMap(Map<String,List<String>> accessUrls) { - this.accessUrls=accessUrls; - } - - public void addAccessUrl(String clusterInstanceId,String accessUrl) { - List<String> strAccessUrl = accessUrls.get(clusterInstanceId); - if (strAccessUrl == null) { - strAccessUrl = new ArrayList<String>(); + public void addAccessUrl(String accessUrl) { + if (accessUrls == null) { + accessUrls = new ArrayList<String>(); } - if (!strAccessUrl.contains(accessUrl)) { - strAccessUrl.add(accessUrl); + if (!accessUrls.contains(accessUrl)) { + accessUrls.add(accessUrl); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/d9fcd85f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceActivatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceActivatedEvent.java index eac7d39..65b262f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceActivatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterInstanceActivatedEvent.java @@ -18,12 +18,11 @@ */ package org.apache.stratos.messaging.event.topology; +import org.apache.stratos.messaging.domain.topology.KubernetesService; import org.apache.stratos.messaging.event.Event; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * Cluster activated event will be sent by Autoscaler @@ -34,14 +33,14 @@ public class ClusterInstanceActivatedEvent extends Event { private final String clusterId; private String appId; private String instanceId; - private Map<String,List<String>> accessUrls; + private List<String> accessUrls; public ClusterInstanceActivatedEvent(String appId, String serviceName, String clusterId, String instanceId) { this.serviceName = serviceName; this.clusterId = clusterId; this.appId = appId; this.instanceId = instanceId; - this.accessUrls = new HashMap<>(); + this.accessUrls = new ArrayList<String>(); } public String getServiceName() { @@ -66,21 +65,20 @@ public class ClusterInstanceActivatedEvent extends Event { return instanceId; } - public List<String> getAccessUrls(String instanceClusterId) { - return accessUrls.get(instanceClusterId); + public List<String> getAccessUrls() { + return accessUrls; } - public void setAccessUrls(Map<String, List<String>> accessUrls) { + public void setAccessUrls(List<String> accessUrls) { this.accessUrls = accessUrls; } - public void addAccessUrl(String clusterInstanceId,String accessUrl) { - List<String> strAccessUrl=accessUrls.get(clusterInstanceId); - if (strAccessUrl == null) { - strAccessUrl = new ArrayList<String>(); + public void addAccessUrl(String accessUrl) { + if (accessUrls == null) { + accessUrls = new ArrayList<String>(); } - if (!strAccessUrl.contains(accessUrl)) { - strAccessUrl.add(accessUrl); + if (!accessUrls.contains(accessUrl)) { + accessUrls.add(accessUrl); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/d9fcd85f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java index fd04994..0aa85b0 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java @@ -21,10 +21,7 @@ package org.apache.stratos.messaging.message.processor.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.domain.instance.ClusterInstance; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.ClusterStatus; -import org.apache.stratos.messaging.domain.topology.Service; -import org.apache.stratos.messaging.domain.topology.Topology; +import org.apache.stratos.messaging.domain.topology.*; import org.apache.stratos.messaging.event.topology.ClusterInstanceActivatedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyApplicationFilter; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; @@ -33,6 +30,9 @@ import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; import org.apache.stratos.messaging.util.MessagingUtil; +import java.net.URL; +import java.util.List; + /** * This processor will act upon the cluster activated event */ @@ -119,7 +119,7 @@ public class ClusterInstanceActivatedProcessor extends MessageProcessor { } } else { // Apply changes to the topology - cluster.setAccessUrls(event.getInstanceId(),event.getAccessUrls(event.getInstanceId())); + cluster.setAccessUrls(event.getAccessUrls()); ClusterInstance context = cluster.getInstanceContexts(event.getInstanceId()); if (context == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/d9fcd85f/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 d73c691..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,7 +717,7 @@ public class ObjectConverter { clusterInstanceBean.getMember().add(memberBean); } } - clusterInstanceBean.setAccessUrls(cluster.getAccessUrls(clusterInstanceBean.getInstanceId())); + clusterInstanceBean.setAccessUrls(cluster.getAccessUrls()); for (String hostname : cluster.getHostNames()) { clusterInstanceBean.getHostNames().add(hostname); }
