Consolidate allocated hosts from all model versions

- Aactivate the superset of hosts allocated from all model versions
- Use the version of each host allocated by the newest model version

2 files changed, 3 insertions, 4 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
index a6749528217..be7f6df21cb 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/AllocatedHosts.java
@@ -1,8 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import com.google.common.collect.ImmutableSet;
-
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
@@ -16,7 +15,7 @@ public class AllocatedHosts {
     private final Set<HostSpec> hosts;
 
     private AllocatedHosts(Set<HostSpec> hosts) {
-        this.hosts = ImmutableSet.copyOf(hosts);
+        this.hosts = new LinkedHashSet<>(hosts); // Preserve order for tests
     }
 
     public static AllocatedHosts withHosts(Set<HostSpec> hosts) {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
index 1818046e810..cb17bceb4ca 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java
@@ -38,7 +38,7 @@ public class HostSpec implements Comparable<HostSpec> {
              Optional.empty(), Optional.empty(), networkPorts, Optional.empty());
     }
 
-    // TODO: Remove after May 2022
+    // TODO: Remove usage
     public HostSpec(String hostname, List<String> ignored, Optional<NetworkPorts> networkPorts) {
         this(hostname,
              NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(),