From 0a5466ec6aa504293c92c7b39d8c156c16ebe5cf Mon Sep 17 00:00:00 2001 From: Andreas Eriksen Date: Fri, 6 Sep 2019 15:44:06 +0200 Subject: Revert "Revert "Revert "Revert "Use real port 4443 for NLBs"""" --- .../src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java | 3 +-- .../provision/provisioning/LoadBalancerProvisionerTest.java | 4 ++-- .../provision/restapi/v2/responses/load-balancers-single.json | 4 ++-- .../hosted/provision/restapi/v2/responses/load-balancers.json | 8 ++++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java index 196a7ff2d05..3c237a9a8a0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/Real.java @@ -13,8 +13,7 @@ import java.util.Objects; */ public class Real implements Comparable { - // TODO: Change to 4443 when moving to HTTPS - private static final int defaultPort = 4080; + private static final int defaultPort = 4443; private final HostName hostname; private final String ipAddress; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java index 08112f9b055..97acdc5bfaf 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java @@ -67,9 +67,9 @@ public class LoadBalancerProvisionerTest { assertEquals(containerCluster1, lbApp1.get().get(0).id().cluster()); assertEquals(Collections.singleton(4443), lbApp1.get().get(0).instance().ports()); assertEquals("127.0.0.1", get(lbApp1.get().get(0).instance().reals(), 0).ipAddress()); - assertEquals(4080, get(lbApp1.get().get(0).instance().reals(), 0).port()); + assertEquals(4443, get(lbApp1.get().get(0).instance().reals(), 0).port()); assertEquals("127.0.0.2", get(lbApp1.get().get(0).instance().reals(), 1).ipAddress()); - assertEquals(4080, get(lbApp1.get().get(0).instance().reals(), 1).port()); + assertEquals(4443, get(lbApp1.get().get(0).instance().reals(), 1).port()); // A container is failed Supplier> containers = () -> tester.getNodes(app1).type(ClusterSpec.Type.container).asList(); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json index 19e65c2fc25..a9a728bab15 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers-single.json @@ -21,12 +21,12 @@ { "hostname": "host13.yahoo.com", "ipAddress": "127.0.13.1", - "port": 4080 + "port": 4443 }, { "hostname": "host14.yahoo.com", "ipAddress": "127.0.14.1", - "port": 4080 + "port": 4443 } ] } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json index 0b05a41af0a..515081bcb8e 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/load-balancers.json @@ -21,12 +21,12 @@ { "hostname": "host1.yahoo.com", "ipAddress": "127.0.1.1", - "port": 4080 + "port": 4443 }, { "hostname": "host10.yahoo.com", "ipAddress": "127.0.10.1", - "port": 4080 + "port": 4443 } ] }, @@ -51,12 +51,12 @@ { "hostname": "host13.yahoo.com", "ipAddress": "127.0.13.1", - "port": 4080 + "port": 4443 }, { "hostname": "host14.yahoo.com", "ipAddress": "127.0.14.1", - "port": 4080 + "port": 4443 } ] } -- cgit v1.2.3