Access flavor resources through resources()

2 files changed, 5 insertions, 5 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
index 134b3bc1cd7..f3fe1fc4915 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializerTest.java
@@ -275,12 +275,12 @@ public class NodeSerializerTest {
     @Test
     public void flavor_overrides_serialization() {
         Node node = createNode();
-        assertEquals(20, node.flavor().getMinDiskAvailableGb(), 0);
+        assertEquals(20, node.flavor().resources().diskGb(), 0);
         node = node.with(node.flavor().with(FlavorOverrides.ofDisk(1234)));
-        assertEquals(1234, node.flavor().getMinDiskAvailableGb(), 0);
+        assertEquals(1234, node.flavor().resources().diskGb(), 0);
 
         Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node));
-        assertEquals(1234, copy.flavor().getMinDiskAvailableGb(), 0);
+        assertEquals(1234, copy.flavor().resources().diskGb(), 0);
         assertEquals(node, copy);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java
index fd2374c55b7..ea4386f2fd5 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java
@@ -102,13 +102,13 @@ public class AllocationVisualizer extends JPanel {
 
         if (isHost) {
             g.setColor(Color.GRAY);
-            for (int i = 0; i < node.flavor().getMinMainMemoryAvailableGb(); i++) {
+            for (int i = 0; i < node.flavor().resources().memoryGb(); i++) {
                 g.fillRect(x, y - nodeHeight, nodeWidth, nodeHeight);
                 y = y - (nodeHeight + 2);
             }
         } else {
             g.setColor(Color.YELLOW);
-            int multi = (int) node.flavor().getMinMainMemoryAvailableGb();
+            int multi = (int) node.flavor().resources().memoryGb();
             int height = multi * nodeHeight + ((multi - 1) * 2);
             g.fillRect(x, y - height, nodeWidth, height);