diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-01-15 08:51:35 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-01-15 08:51:35 +0100 |
| commit | 1925c3ea537550cd0674c317dabf0a0ac8cc91b5 (patch) | |
| tree | 1471fc4c6908cc744163af4c5c23289a47ec911f /node-repository | |
| parent | 636ce799add7e2e8d056c7f61572adbe5081f4c4 (diff) | |
Use correct container port
Diffstat (limited to 'node-repository')
3 files changed, 10 insertions, 9 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 b0f8cb7195c..85cb8455dc7 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,7 +13,8 @@ import java.util.Objects; */ public class Real implements Comparable<Real> { - private static int defaultPort = 4443; + // TODO: Change to 4443 when moving to HTTPS + private static int defaultPort = 4080; 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 ba8fad1f3c5..e340abfa5c1 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 @@ -64,13 +64,13 @@ public class LoadBalancerProvisionerTest { assertEquals(loadBalancers.get(0).id().cluster(), containerCluster1); assertEquals(loadBalancers.get(0).ports(), Collections.singletonList(4443)); assertEquals(loadBalancers.get(0).reals().get(0).ipAddress(), "127.0.0.1"); - assertEquals(loadBalancers.get(0).reals().get(0).port(), 4443); + assertEquals(loadBalancers.get(0).reals().get(0).port(), 4080); assertEquals(loadBalancers.get(0).reals().get(1).ipAddress(), "127.0.0.2"); - assertEquals(loadBalancers.get(0).reals().get(1).port(), 4443); + assertEquals(loadBalancers.get(0).reals().get(1).port(), 4080); // A container is failed List<Node> containers = tester.getNodes(app1).type(ClusterSpec.Type.container).asList(); - tester.nodeRepository().fail(containers.get(0).hostname(), Agent.system, "Failed by unit test"); + tester.nodeRepository().fail(containers.get(0).hostname(), Agent.system, this.getClass().getSimpleName()); // Redeploying replaces failed node tester.activate(app1, prepare(app1, 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 f20eee059ef..3124599db79 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 @@ -14,27 +14,27 @@ { "hostname": "dockerhost1.yahoo.com", "ipAddress": "127.0.0.1", - "port": 4443 + "port": 4080 }, { "hostname": "dockerhost2.yahoo.com", "ipAddress": "127.0.0.1", - "port": 4443 + "port": 4080 }, { "hostname": "dockerhost3.yahoo.com", "ipAddress": "127.0.0.1", - "port": 4443 + "port": 4080 }, { "hostname": "dockerhost4.yahoo.com", "ipAddress": "127.0.0.1", - "port": 4443 + "port": 4080 }, { "hostname": "dockerhost5.yahoo.com", "ipAddress": "127.0.0.1", - "port": 4443 + "port": 4080 } ], "inactive": false |