Revert "Remove dev system"

2 files changed, 33 insertions, 0 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 31643b2ac79..390df571b04 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,6 +128,26 @@ 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 c9b384b95a6..95f25612dd7 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,6 +871,19 @@ 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(),