Use real resources

3 files changed, 18 insertions, 21 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index 37932836e06..30bc1ef5ea3 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -230,27 +230,27 @@ public class NodeSpec {
     }
 
     public double vcpu() {
-        return resources.vcpu();
+        return realResources.vcpu();
     }
 
     public double memoryGb() {
-        return resources.memoryGb();
+        return realResources.memoryGb();
     }
 
     public DiskSize diskSize() {
-        return DiskSize.of(resources.diskGb(), DiskSize.Unit.GB);
+        return DiskSize.of(realResources.diskGb(), DiskSize.Unit.GB);
     }
 
     public double diskGb() {
-        return resources.diskGb();
+        return realResources.diskGb();
     }
 
     public boolean isFastDisk() {
-        return resources.diskSpeed() == fast;
+        return realResources.diskSpeed() == fast;
     }
 
     public double bandwidthGbps() {
-        return resources.bandwidthGbps();
+        return realResources.bandwidthGbps();
     }
 
     public Set<String> ipAddresses() {
@@ -404,8 +404,8 @@ public class NodeSpec {
         private Optional<Instant> wantedFirmwareCheck = Optional.empty();
         private Optional<Instant> currentFirmwareCheck = Optional.empty();
         private Optional<String> modelName = Optional.empty();
-        private NodeResources resources = NodeResources.zero();
-        private NodeResources realResources = NodeResources.zero();
+        private NodeResources resources;
+        private NodeResources realResources;
         private Set<String> ipAddresses = Set.of();
         private Set<String> additionalIpAddresses = Set.of();
         private NodeReports reports = new NodeReports();
@@ -556,23 +556,23 @@ public class NodeSpec {
         }
 
         public Builder vcpu(double vcpu) {
-            return resources(resources.withVcpu(vcpu));
+            return realResources(realResources.withVcpu(vcpu));
         }
 
         public Builder memoryGb(double memoryGb) {
-            return resources(resources.withMemoryGb(memoryGb));
+            return realResources(realResources.withMemoryGb(memoryGb));
         }
 
         public Builder diskGb(double diskGb) {
-            return resources(resources.withDiskGb(diskGb));
+            return realResources(realResources.withDiskGb(diskGb));
         }
 
         public Builder fastDisk(boolean fastDisk) {
-            return resources(resources.with(fastDisk ? fast : slow));
+            return realResources(realResources.with(fastDisk ? fast : slow));
         }
 
         public Builder bandwidthGbps(double bandwidthGbps) {
-            return resources(resources.withBandwidthGbps(bandwidthGbps));
+            return realResources(realResources.withBandwidthGbps(bandwidthGbps));
         }
 
         public Builder ipAddresses(Set<String> ipAddresses) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
index beca554fb2d..2a217ff1c84 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
@@ -143,7 +143,7 @@ public class StorageMaintainerTest {
     @Test
     public void not_run_if_not_enough_used() throws IOException {
         NodeAgentContext context = new NodeAgentContextImpl.Builder(
-                NodeSpec.Builder.testSpec("h123a.domain.tld").resources(new NodeResources(1, 1, 1, 1)).build())
+                NodeSpec.Builder.testSpec("h123a.domain.tld").realResources(new NodeResources(1, 1, 1, 1)).build())
                 .fileSystem(fileSystem).build();
         Files.createDirectories(context.pathOnHostFromPathInNode("/"));
         mockDiskUsage(500L);
@@ -155,7 +155,7 @@ public class StorageMaintainerTest {
     @Test
     public void deletes_correct_amount() throws IOException {
         NodeAgentContext context = new NodeAgentContextImpl.Builder(
-                NodeSpec.Builder.testSpec("h123a.domain.tld").resources(new NodeResources(1, 1, 1, 1)).build())
+                NodeSpec.Builder.testSpec("h123a.domain.tld").realResources(new NodeResources(1, 1, 1, 1)).build())
                 .fileSystem(fileSystem).build();
 
         Files.createDirectories(context.pathOnHostFromPathInNode("/"));
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index 102dd5c9b1c..e7407c1bcc0 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -697,13 +697,10 @@ public class NodeAgentImplTest {
     }
 
     private void verifyThatContainerIsStopped(NodeState nodeState, Optional<ApplicationId> owner) {
-        NodeSpec.Builder nodeBuilder = new NodeSpec.Builder()
-                .resources(resources)
-                .hostname(hostName)
+        NodeSpec.Builder nodeBuilder = nodeBuilder(nodeState)
                 .type(NodeType.tenant)
                 .flavor("docker")
-                .wantedDockerImage(dockerImage).currentDockerImage(dockerImage)
-                .state(nodeState);
+                .wantedDockerImage(dockerImage).currentDockerImage(dockerImage);
 
         owner.ifPresent(nodeBuilder::owner);
         NodeSpec node = nodeBuilder.build();
@@ -784,6 +781,6 @@ public class NodeAgentImplTest {
     }
 
     private NodeSpec.Builder nodeBuilder(NodeState state) {
-        return NodeSpec.Builder.testSpec(hostName, state).resources(resources);
+        return NodeSpec.Builder.testSpec(hostName, state).realResources(resources);
     }
 }