Remove flags dependency from config-model

2 files changed, 9 insertions, 14 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
index 6316adae887..e0c8199a882 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
@@ -13,7 +13,6 @@ import com.yahoo.config.provision.NodeResources.DiskSpeed;
 import com.yahoo.config.provision.NodeResources.StorageType;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.Zone;
-import com.yahoo.config.provision.CapacityPolicies;
 import com.yahoo.vespa.hosted.provision.provisioning.DynamicProvisioningTester;
 import org.junit.Test;
 
@@ -162,7 +161,7 @@ public class AutoscalingTest {
                                                .awsProdSetup(false)
                                                .capacity(Capacity.from(min, max))
                                                .initialResources(Optional.empty())
-                                               .hostSharingFlag()
+                                               .hostSharing()
                                                .build();
         fixture.tester().assertResources("Initial resources at min, since flag turns on host sharing",
                                          7, 1, 2.0, 10.0, 384.0,
@@ -178,7 +177,7 @@ public class AutoscalingTest {
                                                .clusterType(ClusterSpec.Type.container)
                                                .capacity(Capacity.from(min, max))
                                                .initialResources(Optional.empty())
-                                               .hostSharingFlag()
+                                               .hostSharing()
                                                .build();
         fixture.tester().assertResources("Initial resources at min, since flag turns on host sharing",
                                          1, 1, 0.5, 4.0, 10.0,
@@ -389,10 +388,8 @@ public class AutoscalingTest {
                                                .build();
 
         NodeResources defaultResources =
-                new CapacityPolicies(fixture.tester().nodeRepository().zone(),
-                                     fixture.tester().nodeRepository().exclusivity(),
-                                     fixture.tester().nodeRepository().flagSource())
-                        .specifyFully(NodeResources.unspecified(), fixture.clusterSpec, fixture.applicationId);
+                fixture.tester().nodeRepository().capacityPoliciesFor(fixture.applicationId)
+                       .specifyFully(NodeResources.unspecified(), fixture.clusterSpec);
 
         fixture.tester().assertResources("Min number of nodes and default resources",
                                          2, 1, defaultResources,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
index 4ce909fece3..f9f3ca9db8d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Fixture.java
@@ -11,12 +11,10 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.SharedHosts;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
-import com.yahoo.vespa.flags.PermanentFlags;
-import com.yahoo.vespa.flags.custom.HostResources;
-import com.yahoo.vespa.flags.custom.SharedHost;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.applications.Application;
@@ -51,7 +49,7 @@ public class Fixture {
         applicationId = builder.application;
         clusterSpec = builder.cluster;
         capacity = builder.capacity;
-        tester = new DynamicProvisioningTester(builder.zone, builder.resourceCalculator, builder.hostFlavors, builder.flagSource, hostCount);
+        tester = new DynamicProvisioningTester(builder.zone, builder.resourceCalculator, builder.hostFlavors, builder.flagSource, builder.sharedHosts, hostCount);
         var deployCapacity = initialResources.isPresent() ? Capacity.from(initialResources.get()) : capacity;
         tester.deploy(builder.application, builder.cluster, deployCapacity);
         this.loader = new Loader(this);
@@ -178,6 +176,7 @@ public class Fixture {
         HostResourcesCalculator resourceCalculator = new DynamicProvisioningTester.MockHostResourcesCalculator(zone);
         final InMemoryFlagSource flagSource = new InMemoryFlagSource();
         int hostCount = 0;
+        SharedHosts sharedHosts = SharedHosts.empty();
 
         public Fixture.Builder zone(Zone zone) {
             this.zone = zone;
@@ -283,9 +282,8 @@ public class Fixture {
             return this;
         }
 
-        public Fixture.Builder hostSharingFlag() {
-            var resources = new HostResources(8.0, 32.0, 100.0, 10.0, "fast", "local", null, 6, "x86_64");
-            flagSource.withJacksonFlag(PermanentFlags.SHARED_HOST.id(), new SharedHost(List.of(resources)), SharedHost.class);
+        public Fixture.Builder hostSharing() {
+            sharedHosts = SharedHosts.ofConstant(true, false);
             return this;
         }