diff options
Diffstat (limited to 'node-repository')
13 files changed, 100 insertions, 101 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<Real> { - // 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/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java index 48f846d5e7f..03cd3dd4019 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java @@ -11,6 +11,7 @@ import java.util.function.Function; import java.util.stream.Collectors; public class CapacityChecker { + private List<Node> hosts; Map<String, Node> nodeMap; private Map<Node, List<Node>> nodeChildren; @@ -523,4 +524,5 @@ public class CapacityChecker { return out.toString(); } } + } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java index 3c47e418b94..6a6fbf3aed0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityReportMaintainer.java @@ -21,6 +21,7 @@ import java.util.*; * @author mgimle */ public class CapacityReportMaintainer extends Maintainer { + private final Metric metric; private final NodeRepository nodeRepository; private static final Logger log = Logger.getLogger(CapacityReportMaintainer.class.getName()); @@ -35,20 +36,21 @@ public class CapacityReportMaintainer extends Maintainer { @Override protected void maintain() { - if (!nodeRepository.zone().cloud().value().equals("aws")) { - CapacityChecker capacityChecker = new CapacityChecker(this.nodeRepository); - List<Node> overcommittedHosts = capacityChecker.findOvercommittedHosts(); - if (overcommittedHosts.size() != 0) { - log.log(LogLevel.WARNING, String.format("%d nodes are overcommitted! [ %s ]", overcommittedHosts.size(), - overcommittedHosts.stream().map(Node::hostname).collect(Collectors.joining(", ")))); - } - metric.set("overcommittedHosts", overcommittedHosts.size(), null); - - Optional<CapacityChecker.HostFailurePath> failurePath = capacityChecker.worstCaseHostLossLeadingToFailure(); - if (failurePath.isPresent()) { - int worstCaseHostLoss = failurePath.get().hostsCausingFailure.size(); - metric.set("spareHostCapacity", worstCaseHostLoss - 1, null); - } + if (nodeRepository.zone().cloud().value().equals("aws")) return; // Hosts and nodes are 1-1 + + CapacityChecker capacityChecker = new CapacityChecker(this.nodeRepository); + List<Node> overcommittedHosts = capacityChecker.findOvercommittedHosts(); + if (overcommittedHosts.size() != 0) { + log.log(LogLevel.WARNING, String.format("%d nodes are overcommitted! [ %s ]", overcommittedHosts.size(), + overcommittedHosts.stream().map(Node::hostname).collect(Collectors.joining(", ")))); + } + metric.set("overcommittedHosts", overcommittedHosts.size(), null); + + Optional<CapacityChecker.HostFailurePath> failurePath = capacityChecker.worstCaseHostLossLeadingToFailure(); + if (failurePath.isPresent()) { + int worstCaseHostLoss = failurePath.get().hostsCausingFailure.size(); + metric.set("spareHostCapacity", worstCaseHostLoss - 1, null); } } + } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java index 725a3426eae..8a6f308eb34 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java @@ -17,10 +17,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -110,26 +108,14 @@ class Activator { .flatMap(Optional::stream) .collect(Collectors.toSet()); - Map<String, Node> parentsByHostname = nodes.asList().stream() + long numNonActive = nodes.asList().stream() .filter(node -> parentHostnames.contains(node.hostname())) - .collect(Collectors.toMap(Node::hostname, Function.identity())); - - List<Node> unavailableChildren = potentialChildren.stream() - .filter(child -> child.parentHostname() - .map(parentsByHostname::get) - .map(parent -> parent.state() != Node.State.active) - .orElse(false)) - .collect(Collectors.toList()); - - if (!unavailableChildren.isEmpty()) { - String detailedError = unavailableChildren.stream() - .map(child -> child.parentHostname() - .map(parentsByHostname::get) - .map(parent -> String.format("Refusing to activate %s: Its parent (%s) is not active (is %s).", - child.hostname(), parent.hostname(), parent.state()))) - .flatMap(Optional::stream) - .collect(Collectors.joining(" ")); - throw new ParentHostUnavailableException("Activation of " + application + " failed: " + detailedError); + .filter(node -> node.state() != Node.State.active) + .count(); + + if (numNonActive > 0) { + throw new ParentHostUnavailableException("Waiting for hosts to finish booting: " + + numNonActive + "/" + parentHostnames.size() + " left."); } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java index d44b8ca2989..11d3fc23e0f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java @@ -115,7 +115,7 @@ public class NodeFailTester { List<Node> hosts = tester.createHostNodes(numberOfHosts); for (int i = 0; i < hosts.size(); i++) { tester.createReadyNodes(nodesPerHost, i * nodesPerHost, Optional.of("parent" + i), - nodeFlavors.getFlavorOrThrow("d-1-1-1"), NodeType.tenant); + new NodeResources(1, 1, 1, 0.3), NodeType.tenant); } // Create applications @@ -232,8 +232,8 @@ public class NodeFailTester { return createReadyNodes(count, startIndex, Optional.empty(), new Flavor(resources), NodeType.tenant); } - public List<Node> createReadyNodes(int count, int startIndex, Flavor flavor) { - return createReadyNodes(count, startIndex, Optional.empty(), flavor, NodeType.tenant); + private List<Node> createReadyNodes(int count, int startIndex, Optional<String> parentHostname, NodeResources resources, NodeType nodeType) { + return createReadyNodes(count, startIndex, parentHostname, new Flavor(resources), nodeType); } private List<Node> createReadyNodes(int count, int startIndex, Optional<String> parentHostname, Flavor flavor, NodeType nodeType) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java index 762fd87c2d1..50fb8290bd5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java @@ -37,16 +37,17 @@ public class AclProvisioningTest { List<Node> configServers = tester.makeConfigServers(3, "d-1-1-1", Version.fromString("6.123.456")); // Populate repo - tester.makeReadyNodes(10, "d-1-1-1"); - List<Node> dockerHost = tester.makeReadyNodes(1, "d-1-1-1", NodeType.host); + tester.makeReadyNodes(10, new NodeResources(1, 1, 1, 1)); + List<Node> dockerHost = tester.makeReadyNodes(1, new NodeResources(1, 1, 1, 1), NodeType.host); ApplicationId zoneApplication = tester.makeApplicationId(); deploy(zoneApplication, Capacity.fromRequiredNodeType(NodeType.host)); - tester.makeReadyVirtualDockerNodes(1, NodeResources.fromLegacyName("d-1-1-1"), dockerHost.get(0).hostname()); - List<Node> proxyNodes = tester.makeReadyNodes(3, "d-1-1-1", NodeType.proxy); + tester.makeReadyVirtualDockerNodes(1,new NodeResources(1, 1, 1, 1), + dockerHost.get(0).hostname()); + List<Node> proxyNodes = tester.makeReadyNodes(3, new NodeResources(1, 1, 1, 1), NodeType.proxy); // Allocate 2 nodes ApplicationId application = tester.makeApplicationId(); - List<Node> activeNodes = deploy(application, Capacity.fromCount(2, NodeResources.fromLegacyName("d-1-1-1"), false, true)); + List<Node> activeNodes = deploy(application, Capacity.fromCount(2, new NodeResources(1, 1, 1, 1), false, true)); assertEquals(2, activeNodes.size()); // Get trusted nodes for the first active node diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java index efff5333fae..1e25e861cbe 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java @@ -358,6 +358,7 @@ public class DynamicDockerAllocationTest { NodeResources.DiskSpeed.slow, hosts.get(0).flavor().get().resources().diskSpeed()); } + @SuppressWarnings("deprecation") @Test public void testSwitchingFromLegacyFlavorSyntaxToResourcesDoesNotCauseReallocation() { ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).flavorsConfig(flavorsConfig()).build(); 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..c1df79ce492 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 @@ -54,8 +54,8 @@ public class LoadBalancerProvisionerTest { // Provision a load balancer for each application var nodes = prepare(app1, - clusterRequest(ClusterSpec.Type.container, containerCluster1), - clusterRequest(ClusterSpec.Type.content, contentCluster)); + clusterRequest(ClusterSpec.Type.container, containerCluster1), + clusterRequest(ClusterSpec.Type.content, contentCluster)); assertEquals(1, lbApp1.get().size()); assertEquals("Prepare provisions load balancer with reserved nodes", 2, lbApp1.get().get(0).instance().reals().size()); tester.activate(app1, nodes); @@ -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<List<Node>> containers = () -> tester.getNodes(app1).type(ClusterSpec.Type.container).asList(); @@ -212,7 +212,7 @@ public class LoadBalancerProvisionerTest { if (dynamicDockerNodes) { makeDynamicDockerNodes(specs.length * 2, capacity.type()); } else { - tester.makeReadyNodes(specs.length * 2, "d-1-1-1", capacity.type()); + tester.makeReadyNodes(specs.length * 2, new NodeResources(1, 1, 1, 0.3), capacity.type()); } Set<HostSpec> allNodes = new LinkedHashSet<>(); for (ClusterSpec spec : specs) { @@ -225,7 +225,8 @@ public class LoadBalancerProvisionerTest { List<Node> nodes = new ArrayList<>(n); for (int i = 1; i <= n; i++) { var node = Node.createDockerNode(Set.of(), "node" + i, "parent" + i, - NodeResources.fromLegacyName("d-1-1-1"), nodeType); + new NodeResources(1, 1, 1, 0.3), + nodeType); nodes.add(node); } nodes = tester.nodeRepository().database().addNodesInState(nodes, Node.State.reserved); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java index a10f0bc5f23..1836589c0ab 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java @@ -33,31 +33,34 @@ import static org.junit.Assert.assertTrue; */ public class MultigroupProvisioningTest { + private static final NodeResources small = new NodeResources(1, 1, 1, 1); + private static final NodeResources large = new NodeResources(3, 3, 3, 3); + @Test public void test_provisioning_of_multiple_groups() { ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build(); ApplicationId application1 = tester.makeApplicationId(); - tester.makeReadyNodes(21, "d-1-3-9"); - - deploy(application1, 6, 1, "d-1-3-9", tester); - deploy(application1, 6, 2, "d-1-3-9", tester); - deploy(application1, 6, 3, "d-1-3-9", tester); - deploy(application1, 6, 6, "d-1-3-9", tester); - deploy(application1, 6, 1, "d-1-3-9", tester); - deploy(application1, 6, 6, "d-1-3-9", tester); - deploy(application1, 6, 6, "d-1-3-9", tester); - deploy(application1, 6, 2, "d-1-3-9", tester); - deploy(application1, 8, 2, "d-1-3-9", tester); - deploy(application1, 9, 3, "d-1-3-9", tester); - deploy(application1, 9, 3, "d-1-3-9", tester); - deploy(application1, 9, 3, "d-1-3-9", tester); - deploy(application1,12, 4, "d-1-3-9", tester); - deploy(application1, 8, 4, "d-1-3-9", tester); - deploy(application1,12, 4, "d-1-3-9", tester); - deploy(application1, 8, 2, "d-1-3-9", tester); - deploy(application1, 6, 3, "d-1-3-9", tester); + tester.makeReadyNodes(21, small); + + deploy(application1, 6, 1, small, tester); + deploy(application1, 6, 2, small, tester); + deploy(application1, 6, 3, small, tester); + deploy(application1, 6, 6, small, tester); + deploy(application1, 6, 1, small, tester); + deploy(application1, 6, 6, small, tester); + deploy(application1, 6, 6, small, tester); + deploy(application1, 6, 2, small, tester); + deploy(application1, 8, 2, small, tester); + deploy(application1, 9, 3, small, tester); + deploy(application1, 9, 3, small, tester); + deploy(application1, 9, 3, small, tester); + deploy(application1,12, 4, small, tester); + deploy(application1, 8, 4, small, tester); + deploy(application1,12, 4, small, tester); + deploy(application1, 8, 2, small, tester); + deploy(application1, 6, 3, small, tester); } /** @@ -65,13 +68,14 @@ public class MultigroupProvisioningTest { * due to asymmetric group sizes after step 2 (second group has 3 additional retired nodes). * We probably need to switch to a multipass group allocation procedure to fix this case. */ - @Test @Ignore + @Ignore + @Test public void test_provisioning_of_groups_with_asymmetry() { ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build(); ApplicationId application1 = tester.makeApplicationId(); - tester.makeReadyNodes(21, "d-1-3-9"); + tester.makeReadyNodes(21, large); deploy(application1, 12, 2, tester); deploy(application1, 9, 3, tester); @@ -84,12 +88,12 @@ public class MultigroupProvisioningTest { ApplicationId application1 = tester.makeApplicationId(); - tester.makeReadyNodes(10, "d-1-1-1"); - tester.makeReadyNodes(10, "d-3-3-3"); + tester.makeReadyNodes(10, small); + tester.makeReadyNodes(10, large); - deploy(application1, 8, 1, "d-1-1-1", tester); - deploy(application1, 8, 1, "d-3-3-3", tester); - deploy(application1, 8, 8, "d-3-3-3", tester); + deploy(application1, 8, 1, small, tester); + deploy(application1, 8, 1, large, tester); + deploy(application1, 8, 8, large, tester); } @Test @@ -98,10 +102,10 @@ public class MultigroupProvisioningTest { ApplicationId application1 = tester.makeApplicationId(); - tester.makeReadyNodes(10, "d-1-1-1"); + tester.makeReadyNodes(10, small); - deploy(application1, Capacity.fromNodeCount(1, Optional.of("d-1-1-1"), true, true), 1, tester); - deploy(application1, Capacity.fromNodeCount(2, Optional.of("d-1-1-1"), true, true), 2, tester); + deploy(application1, Capacity.fromCount(1, Optional.of(small), true, true), 1, tester); + deploy(application1, Capacity.fromCount(2, Optional.of(small), true, true), 2, tester); } @Test @@ -110,11 +114,11 @@ public class MultigroupProvisioningTest { ApplicationId application1 = tester.makeApplicationId(); - tester.makeReadyNodes(10, "d-1-1-1"); - tester.makeReadyNodes(10, "d-3-3-3"); + tester.makeReadyNodes(10, small); + tester.makeReadyNodes(10, large); - deploy(application1, Capacity.fromNodeCount(1, Optional.of("d-1-1-1"), true, true), 1, tester); - deploy(application1, Capacity.fromNodeCount(2, Optional.of("d-3-3-3"), true, true), 2, tester); + deploy(application1, Capacity.fromCount(1, Optional.of(small), true, true), 1, tester); + deploy(application1, Capacity.fromCount(2, Optional.of(large), true, true), 2, tester); } @Test @@ -123,11 +127,11 @@ public class MultigroupProvisioningTest { ApplicationId application1 = tester.makeApplicationId(); - tester.makeReadyNodes(10, "d-1-1-1"); - tester.makeReadyNodes(10, "d-3-3-3"); + tester.makeReadyNodes(10, small); + tester.makeReadyNodes(10, large); - deploy(application1, 8, 1, "d-1-1-1", tester); - deploy(application1, 8, 1, "d-3-3-3", tester); + deploy(application1, 8, 1, small, tester); + deploy(application1, 8, 1, large, tester); // Expire small nodes tester.advanceTime(Duration.ofDays(7)); @@ -136,19 +140,19 @@ public class MultigroupProvisioningTest { tester.clock(), Collections.singletonMap(application1, new MockDeployer.ApplicationContext(application1, cluster(), - Capacity.fromNodeCount(8, Optional.of("d-3-3-3"), false, true), 1))); + Capacity.fromCount(8, Optional.of(large), false, true), 1))); new RetiredExpirer(tester.nodeRepository(), tester.orchestrator(), deployer, tester.clock(), Duration.ofDays(30), Duration.ofHours(12)).run(); - assertEquals(8, tester.getNodes(application1, Node.State.inactive).resources(new NodeResources(1, 1, 1, 0.3)).size()); - deploy(application1, 8, 8, "d-3-3-3", tester); + assertEquals(8, tester.getNodes(application1, Node.State.inactive).resources(small).size()); + deploy(application1, 8, 8, large, tester); } - private void deploy(ApplicationId application, int nodeCount, int groupCount, String flavor, ProvisioningTester tester) { - deploy(application, Capacity.fromNodeCount(nodeCount, Optional.of(flavor), false, true), groupCount, tester); + private void deploy(ApplicationId application, int nodeCount, int groupCount, NodeResources resources, ProvisioningTester tester) { + deploy(application, Capacity.fromCount(nodeCount, Optional.of(resources), false, true), groupCount, tester); } private void deploy(ApplicationId application, int nodeCount, int groupCount, ProvisioningTester tester) { - deploy(application, Capacity.fromNodeCount(nodeCount, Optional.of("d-3-3-3"), false, true), groupCount, tester); + deploy(application, Capacity.fromCount(nodeCount, Optional.of(large), false, true), groupCount, tester); } private void deploy(ApplicationId application, Capacity capacity, int wantedGroups, ProvisioningTester tester) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index 851a734674f..58440372821 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -438,7 +438,7 @@ public class ProvisioningTest { ClusterSpec.Id.from("music"), new com.yahoo.component.Version(4, 5, 6), false); - tester.prepare(application, cluster, Capacity.fromNodeCount(5, Optional.empty(), false, false), 1); + tester.prepare(application, cluster, Capacity.fromCount(5, Optional.empty(), false, false), 1); // No exception; Success } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index 79f83dd3a33..203f922d132 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -239,6 +239,9 @@ public class ProvisioningTester { public List<Node> makeReadyNodes(int n, String flavor, NodeType type) { return makeReadyNodes(n, asFlavor(flavor, type), type, 0); } + public List<Node> makeReadyNodes(int n, NodeResources resources, NodeType type) { + return makeReadyNodes(n, new Flavor(resources), type, 0); + } public List<Node> makeReadyNodes(int n, NodeResources resources, NodeType type, int ipAddressPoolSize) { return makeReadyNodes(n, new Flavor(resources), type, ipAddressPoolSize); } 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 } ] } |