Revert "Adding the missing changes" This reverts commit fa985691e5d6a105290717ba1adb2c4de51d969c.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c960c146 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c960c146 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c960c146 Branch: refs/heads/master Commit: c960c146132261a05ac02991dc620c56b6cc3279 Parents: 407cd11 Author: gayangunarathne <[email protected]> Authored: Mon Nov 2 16:52:58 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Nov 2 16:52:58 2015 +0530 ---------------------------------------------------------------------- .../messaging/topology/TopologyBuilder.java | 34 +------------------- .../rest/endpoint/api/StratosApiV41Utils.java | 16 ++++----- .../util/converter/ObjectConverter.java | 1 - 3 files changed, 9 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c960c146/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 c4c2df9..0e5c4a5 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 @@ -31,7 +31,6 @@ import org.apache.stratos.cloud.controller.messaging.publisher.TopologyEventPubl import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.common.Property; -import org.apache.stratos.kubernetes.client.KubernetesConstants; import org.apache.stratos.messaging.domain.application.ClusterDataHolder; import org.apache.stratos.messaging.domain.instance.ClusterInstance; import org.apache.stratos.messaging.domain.topology.*; @@ -45,8 +44,6 @@ import org.apache.stratos.messaging.event.topology.*; import org.apache.stratos.metadata.client.defaults.DefaultMetaDataServiceClient; import org.apache.stratos.metadata.client.defaults.MetaDataServiceClient; -import java.net.URI; -import java.net.URISyntaxException; import java.util.*; /** @@ -860,37 +857,8 @@ public class TopologyBuilder { try { TopologyManager.acquireWriteLock(); List<KubernetesService> kubernetesServices = clusterContext.getKubernetesServices(); + cluster.setKubernetesServices(kubernetesServices); - if (kubernetesServices != null) { - - try { - // Generate access URLs for kubernetes services - for (KubernetesService kubernetesService : kubernetesServices) { - - if (kubernetesService.getServiceType().equals(KubernetesConstants.NODE_PORT)) { - // Public IP = Kubernetes minion public IP - String[] publicIPs = kubernetesService.getPublicIPs(); - if ((publicIPs != null) && (publicIPs.length > 0)) { - for (String publicIP : publicIPs) { - // There can be a String array with null values - if (publicIP != null) { - // 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()); - 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())); - } - } - } - } - } - } catch (URISyntaxException e) { - log.error("Could not create access URLs for Kubernetes services", e); - } - } ClusterInstance context = cluster.getInstanceContexts(clusterStatusClusterActivatedEvent.getInstanceId()); if (context == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/c960c146/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 761c9f1..629fdb5 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 @@ -65,7 +65,6 @@ import org.apache.stratos.common.client.StratosManagerServiceClient; import org.apache.stratos.common.exception.InvalidEmailException; import org.apache.stratos.common.util.ClaimsMgtUtil; import org.apache.stratos.common.util.CommonUtil; -import org.apache.stratos.kubernetes.client.KubernetesConstants; import org.apache.stratos.manager.service.stub.StratosManagerServiceApplicationSignUpExceptionException; import org.apache.stratos.manager.service.stub.StratosManagerServiceDomainMappingExceptionException; import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp; @@ -159,13 +158,14 @@ public class StratosApiV41Utils { String type = portMapping.getKubernetesPortType(); if (isKubernetesIaasProviderAvailable) { - if (type == null || type.equals("")) { - portMapping.setKubernetesPortType(KubernetesConstants.NODE_PORT); - } else if (!type.equals(KubernetesConstants.NODE_PORT) && !type.equals - (KubernetesConstants.CLUSTER_IP)) { - throw new RestAPIException((String.format("Kubernetes" + - "PortType is invalid : %s - Possible values - %s and %s", portMapping.getName(), - KubernetesConstants.NODE_PORT, KubernetesConstants.CLUSTER_IP))); + if (type == null) { + throw new RestAPIException((String.format("Type is not found in portmapping: %s - Possible " + + "values - %s and %s", portMapping.getName(), KUBERNETES_SERVICE_TYPE_NODEPORT, + KUBERNETES_SERVICE_TYPE_CLUSTERIP))); + } else if (!type.equals(KUBERNETES_SERVICE_TYPE_NODEPORT) && !type.equals(KUBERNETES_SERVICE_TYPE_CLUSTERIP)) { + throw new RestAPIException((String.format("Type is not found in portmapping: %s - Possible " + + "values - %s and %s", portMapping.getName(), KUBERNETES_SERVICE_TYPE_NODEPORT, + KUBERNETES_SERVICE_TYPE_CLUSTERIP))); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/c960c146/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 b2d76ef..eea8434 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 @@ -168,7 +168,6 @@ public class ObjectConverter { portMappingBean.setProtocol(portMapping.getProtocol()); portMappingBean.setPort(portMapping.getPort()); portMappingBean.setProxyPort(portMapping.getProxyPort()); - portMappingBean.setKubernetesPortType(portMapping.getKubernetesPortType()); portMappingBeans.add(portMappingBean); } return portMappingBeans;
