Repository: stratos Updated Branches: refs/heads/master c6907d17e -> a8146cbb7
Fixing unrelated warning in VM case Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a8146cbb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a8146cbb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a8146cbb Branch: refs/heads/master Commit: a8146cbb7ae8859923036ffdbcc3ecf87378a7cc Parents: c6907d1 Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Nov 10 16:57:03 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Nov 10 16:57:03 2014 +0530 ---------------------------------------------------------------------- .../controller/topology/TopologyBuilder.java | 41 ++++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a8146cbb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index 7880584..6935dea 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -356,31 +356,40 @@ public class TopologyBuilder { member.setMemberPublicIp(publicIp); member.setProperties(CloudControllerUtil.toJavaUtilProperties(context.getProperties())); try { - // Update port mappings with generated service proxy port - // TODO: Need to properly fix with the latest Kubernetes version - String serviceHostPortStr = CloudControllerUtil.getProperty(context.getProperties(), StratosConstants.ALLOCATED_SERVICE_HOST_PORT); - if(StringUtils.isEmpty(serviceHostPortStr)) { - log.warn("Kubernetes service host port not found for member: [member-id] " + memberId); - } - Cartridge cartridge = FasterLookUpDataHolder.getInstance(). - getCartridge(serviceName); + Cartridge cartridge = FasterLookUpDataHolder.getInstance().getCartridge(serviceName); List<PortMapping> portMappings = cartridge.getPortMappings(); Port port; - // Adding ports to the member - for (PortMapping portMapping : portMappings) { - if (cluster.isKubernetesCluster() && (StringUtils.isNotEmpty(serviceHostPortStr))) { - port = new Port(portMapping.getProtocol(), - Integer.parseInt(serviceHostPortStr), - Integer.parseInt(portMapping.getProxyPort())); - member.addPort(port); - } else { + if(cluster.isKubernetesCluster()){ + // Update port mappings with generated service proxy port + // TODO: Need to properly fix with the latest Kubernetes version + String serviceHostPortStr = CloudControllerUtil.getProperty(context.getProperties(), StratosConstants.ALLOCATED_SERVICE_HOST_PORT); + if(StringUtils.isEmpty(serviceHostPortStr)) { + log.warn("Kubernetes service host port not found for member: [member-id] " + memberId); + } + // Adding ports to the member + if (StringUtils.isNotEmpty(serviceHostPortStr)) { + for (PortMapping portMapping : portMappings) { + port = new Port(portMapping.getProtocol(), + Integer.parseInt(serviceHostPortStr), + Integer.parseInt(portMapping.getProxyPort())); + member.addPort(port); + } + } + + } else { + + // Adding ports to the member + for (PortMapping portMapping : portMappings) { + port = new Port(portMapping.getProtocol(), Integer.parseInt(portMapping.getPort()), Integer.parseInt(portMapping.getProxyPort())); member.addPort(port); + } } + } catch (Exception e) { log.error("Could not update member port-map: [member-id] " + memberId, e); }
