Repository: stratos Updated Branches: refs/heads/stratos-4.1.x adab632d8 -> 500e9c2f7
Remove redundant attribute kubernetesServiceType from ClusterPortMapping Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/500e9c2f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/500e9c2f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/500e9c2f Branch: refs/heads/stratos-4.1.x Commit: 500e9c2f73945465c532c4a45fb971448f8565c8 Parents: adab632 Author: Akila Perera <[email protected]> Authored: Mon Sep 21 00:06:02 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Mon Sep 21 00:06:02 2015 +0530 ---------------------------------------------------------------------- .../controller/domain/ClusterPortMapping.java | 11 +---------- .../cloud/controller/domain/PortMapping.java | 8 ++++---- .../iaases/kubernetes/KubernetesIaas.java | 20 +++++++++----------- .../messaging/topology/TopologyBuilder.java | 4 ++-- .../util/CloudControllerConstants.java | 3 +-- 5 files changed, 17 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/500e9c2f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java index a7413fe..1764477 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java @@ -32,7 +32,6 @@ public class ClusterPortMapping extends PortMapping implements Serializable { private String clusterId; private boolean kubernetes; private int kubernetesServicePort; - private String kubernetesServiceType; public ClusterPortMapping() { } @@ -62,14 +61,6 @@ public class ClusterPortMapping extends PortMapping implements Serializable { kubernetes = true; } - public void setKubernetesServiceType(String kubernetesServiceType) { - this.kubernetesServiceType = kubernetesServiceType; - } - - public String getKubernetesServiceType() { - return kubernetesServiceType; - } - public boolean isKubernetes() { return kubernetes; } @@ -83,6 +74,6 @@ public class ClusterPortMapping extends PortMapping implements Serializable { public String toString() { return "[application-id] " + getApplicationId() + " [cluster-id] " + getClusterId() + ", " + super.toString() + " [kubernetes-service-port] " + getKubernetesServicePort() + ", " + - "[kubernetes-service-type] " + getKubernetesServiceType(); + "[kubernetes-port-type] " + getKubernetesPortType(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/500e9c2f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java index 5e2e35e..bb19bde 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java @@ -30,14 +30,14 @@ public class PortMapping implements Serializable { private int proxyPort; private String kubernetesPortType; - public String getKubernetesPortType() { - return kubernetesPortType; - } - public void setKubernetesPortType(String kubernetesPortType) { this.kubernetesPortType = kubernetesPortType; } + public String getKubernetesPortType() { + return kubernetesPortType; + } + public PortMapping() { } http://git-wip-us.apache.org/repos/asf/stratos/blob/500e9c2f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index d231932..a462923 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -545,7 +545,7 @@ public class KubernetesIaas extends Iaas { // Create kubernetes service for port mapping int servicePort = clusterPortMapping.getKubernetesServicePort(); - String serviceType = clusterPortMapping.getKubernetesServiceType(); + String serviceType = clusterPortMapping.getKubernetesPortType(); String containerPortName = KubernetesIaasUtil.preparePortNameFromPortMapping(clusterPortMapping); Map<String, String> serviceLabels = new HashMap<>(); @@ -559,10 +559,8 @@ public class KubernetesIaas extends Iaas { .put(CloudControllerConstants.APPLICATION_ID_LABEL, clusterContext.getApplicationId()); serviceAnnotations.put(CloudControllerConstants.CLUSTER_ID_LABEL, clusterContext.getClusterId()); serviceAnnotations.put(CloudControllerConstants.PROTOCOL_LABEL, clusterPortMapping.getProtocol()); - serviceAnnotations.put(CloudControllerConstants.SERVICE_TYPE_LABEL, - clusterPortMapping.getKubernetesServiceType()); - serviceAnnotations - .put(CloudControllerConstants.PORT_TYPE_LABEL, clusterPortMapping.getKubernetesPortType()); + serviceAnnotations.put(CloudControllerConstants.PORT_TYPE_LABEL, + clusterPortMapping.getKubernetesPortType()); serviceAnnotations.put(CloudControllerConstants.SERVICE_PORT_LABEL, String.valueOf(clusterPortMapping .getKubernetesServicePort())); serviceAnnotations @@ -592,10 +590,10 @@ public class KubernetesIaas extends Iaas { kubernetesService.setProtocol(clusterPortMapping.getProtocol()); kubernetesService.setPortName(clusterPortMapping.getName()); - String kubernetesServiceType = service.getSpec().getType(); - kubernetesService.setServiceType(kubernetesServiceType); + String kubernetesPortType = service.getSpec().getType(); + kubernetesService.setServiceType(kubernetesPortType); - if (kubernetesServiceType.equals(KubernetesConstants.NODE_PORT)) { + if (kubernetesPortType.equals(KubernetesConstants.NODE_PORT)) { kubernetesService.setPort(service.getSpec().getPorts().get(0).getNodePort()); } else { kubernetesService.setPort(service.getSpec().getPorts().get(0).getPort()); @@ -683,14 +681,14 @@ public class KubernetesIaas extends Iaas { portMapping.getName())); } - if (clusterPortMapping.getKubernetesServiceType() == null) { + if (clusterPortMapping.getKubernetesPortType() == null) { throw new CloudControllerException(String.format("Kubernetes service type not " + "found [application-id] %s [cluster-id] %s [cartridge] %s", applicationId, clusterId, cartridge)); } String serviceType = portMapping.getKubernetesPortType(); - clusterPortMapping.setKubernetesServiceType(serviceType); + clusterPortMapping.setKubernetesPortType(serviceType); // If kubernetes service port is already set, skip setting a new one if (clusterPortMapping.getKubernetesServicePort() == 0) { @@ -729,7 +727,7 @@ public class KubernetesIaas extends Iaas { portMappingStrBuilder.append(String.format("NAME:%s|PROTOCOL:%s|PORT:%d|PROXY_PORT:%d|TYPE:%s", clusterPortMapping.getName(), clusterPortMapping.getProtocol(), clusterPortMapping.getKubernetesServicePort(), clusterPortMapping.getProxyPort(), - clusterPortMapping.getKubernetesServiceType())); + clusterPortMapping.getKubernetesPortType())); if (log.isInfoEnabled()) { log.info(String.format("Kubernetes service port generated: [application-id] %s " + http://git-wip-us.apache.org/repos/asf/stratos/blob/500e9c2f/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 851d334..528c6ae 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 @@ -61,7 +61,7 @@ public class TopologyBuilder { Service service; Topology topology = TopologyManager.getTopology(); if (cartridgeList == null) { - log.warn(String.format("Cartridge list is empty")); + log.warn("Cartridge list is empty"); return; } @@ -183,7 +183,7 @@ public class TopologyBuilder { cluster.getClusterId(), portMapping.getName(), portMapping.getProtocol(), portMapping.getPort(), portMapping.getProxyPort()); if (portMapping.getKubernetesPortType() != null) { - clusterPortMapping.setKubernetesServiceType(portMapping.getKubernetesPortType()); + clusterPortMapping.setKubernetesPortType(portMapping.getKubernetesPortType()); } CloudControllerContext.getInstance().addClusterPortMapping(clusterPortMapping); log.debug("Cluster port mapping created: " + clusterPortMapping.toString()); http://git-wip-us.apache.org/repos/asf/stratos/blob/500e9c2f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java index 483283b..a29c755 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java @@ -103,7 +103,7 @@ public final class CloudControllerConstants { public static final String MD5_HEX_APPLICATION_ID_LABEL = "md5Hex-applicationId"; public static final String MD5_HEX_MEMBER_ID_LABEL = "md5Hex-memberId"; public static final String CARTRIDGE_TYPE_LABEL = "cartridgeType"; - public static final String SERVICE_TYPE_LABEL = "serviceType"; + public static final String PORT_TYPE_LABEL = "portType"; public static final String MD5_HEX_CLUSTER_ID_LABEL = "md5Hex-clusterId"; public static final String CLUSTER_ID_LABEL = "clusterId"; public static final String CLUSTER_INSTANCE_ID_LABEL = "clusterInstanceId"; @@ -130,7 +130,6 @@ public final class CloudControllerConstants { public static final String PROTOCOL_LABEL = "protocol"; public static final String SERVICE_PORT_LABEL = "servicePort"; public static final String PROXY_PORT_LABEL = "proxyPort"; - public static final String PORT_TYPE_LABEL = "portType"; /** * Properties
