diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-01-14 19:02:28 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2022-01-14 19:02:28 +0100 |
commit | 780e2798d2cc2d0458198090bae8f4b5c56b6168 (patch) | |
tree | cb259da49a6b0d6b47f57aae871d267b05da1bd6 /node-repository/src/test/java/com/yahoo | |
parent | a0ba343a01db44795cce1c610d5d14d7fb450e71 (diff) |
Remove dev system
Diffstat (limited to 'node-repository/src/test/java/com/yahoo')
2 files changed, 0 insertions, 33 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java index 390df571b04..31643b2ac79 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java @@ -128,26 +128,6 @@ public class HostCapacityTest { } @Test - public void devhostCapacityTest() { - // Dev host can assign both configserver and tenant containers. - - var nodeFlavors = FlavorConfigBuilder.createDummies("devhost", "container"); - var devHost = Node.create("devhost", new IP.Config(Set.of("::1"), createIps(2, 10)), "devhost", nodeFlavors.getFlavorOrThrow("devhost"), NodeType.devhost).build(); - - var cfg = Node.reserve(Set.of("::2"), "cfg", "devhost", resources0, NodeType.config).build(); - - var nodes = new ArrayList<>(List.of(cfg)); - var capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); - assertTrue(capacity.hasCapacity(devHost, resources0)); - - var container1 = Node.reserve(Set.of("::3"), "container1", "devhost", resources0, NodeType.tenant).build(); - nodes = new ArrayList<>(List.of(cfg, container1)); - capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); - assertFalse(capacity.hasCapacity(devHost, resources0)); - - } - - @Test public void verifyCapacityFromAddresses() { Node nodeA = Node.reserve(Set.of("::2"), "nodeA", "host1", resources0, NodeType.tenant).build(); Node nodeB = Node.reserve(Set.of("::3"), "nodeB", "host1", resources0, NodeType.tenant).build(); 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 95f25612dd7..c9b384b95a6 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 @@ -871,19 +871,6 @@ public class ProvisioningTest { } @Test - public void devsystem_application_deployment_on_devhost() { - ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(SystemName.dev, Environment.dev, RegionName.from("no-central"))).build(); - - tester.makeReadyNodes(4, defaultResources, NodeType.devhost, 1); - tester.prepareAndActivateInfraApplication(ProvisioningTester.applicationId(), NodeType.devhost); - - ApplicationId application = ProvisioningTester.applicationId(); - SystemState state = prepare(application, 2, 2, 3, 3, defaultResources, tester); - assertEquals(4, state.allHosts.size()); - tester.activate(application, state.allHosts); - } - - @Test public void allocates_reserved_nodes_for_type_spec_deployment() { ProvisioningTester tester = new ProvisioningTester.Builder().build(); Function<InfraApplication, Collection<HostSpec>> prepareAndActivate = app -> tester.activate(app.getApplicationId(), |