memoryGb => memoryGiB

3 files changed, 7 insertions, 7 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
index b7e612127c1..36839e72e10 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
@@ -209,7 +209,7 @@ public class ResourcesReductionValidatorTest {
         String resourcesStr = resources == null ?
                 "" :
                 String.format("        <resources vcpu='%.0f' memory='%.0fG' disk='%.0fG'/>",
-                        resources.vcpu(), resources.memoryGb(), resources.diskGb());
+                        resources.vcpu(), resources.memoryGiB(), resources.diskGb());
         return "<services version='1.0'>" +
                 "  <container id='default' version='1.0'>" +
                 "    <nodes count='" + nodes + "'>" +
@@ -223,7 +223,7 @@ public class ResourcesReductionValidatorTest {
         String resourcesStr = resources == null ?
                               "" :
                               String.format("        <resources vcpu='%.0f' memory='%.0fG' disk='%.0fG'/>",
-                                            resources.vcpu(), resources.memoryGb(), resources.diskGb());
+                                            resources.vcpu(), resources.memoryGiB(), resources.diskGb());
         return "<services version='1.0'>" +
                "  <content id='default' version='1.0'>" +
                "    <redundancy>1</redundancy>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java
index 344471cada0..e0193d10e23 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecificationTest.java
@@ -42,8 +42,8 @@ public class NodesSpecificationTest {
         assertEquals(2, spec.minResources().nodeResources().vcpu(), 1e-9);
         assertEquals(2, spec.maxResources().nodeResources().vcpu(), 1e-9);
 
-        assertEquals(3e15, spec.minResources().nodeResources().memoryGb(), 1e-9);
-        assertEquals(3e15, spec.maxResources().nodeResources().memoryGb(), 1e-9);
+        assertEquals(3e15, spec.minResources().nodeResources().memoryGiB(), 1e-9);
+        assertEquals(3e15, spec.maxResources().nodeResources().memoryGiB(), 1e-9);
 
         assertEquals(4e3, spec.minResources().nodeResources().diskGb(), 1e-9);
         assertEquals(4e3, spec.maxResources().nodeResources().diskGb(), 1e-9);
@@ -54,8 +54,8 @@ public class NodesSpecificationTest {
         assertEquals(1 << 30, spec.minResources().nodeResources().gpuResources().count());
         assertEquals(1 << 30, spec.maxResources().nodeResources().gpuResources().count());
 
-        assertEquals(3e-9, spec.minResources().nodeResources().gpuResources().memoryGb(), 1e-12);
-        assertEquals(3e-9, spec.maxResources().nodeResources().gpuResources().memoryGb(), 1e-12);
+        assertEquals(3e-9, spec.minResources().nodeResources().gpuResources().memoryGiB(), 1e-12);
+        assertEquals(3e-9, spec.maxResources().nodeResources().gpuResources().memoryGiB(), 1e-12);
 
         assertEquals(DiskSpeed.fast, spec.minResources().nodeResources().diskSpeed());
         assertEquals(DiskSpeed.fast, spec.maxResources().nodeResources().diskSpeed());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 7037480f853..887db9c9cc9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -88,7 +88,7 @@ public class VespaModelTester {
             // (for e.g cluster controllers and slobrok nodes)
             String hostname = String.format("%s-%02d",
                                             "node" + "-" + Math.round(resources.vcpu()) +
-                                                     "-" + Math.round(resources.memoryGb()) +
+                                                     "-" + Math.round(resources.memoryGiB()) +
                                                      "-" + Math.round(resources.diskGb()),
                                             count - i);
             hosts.add(new Host(hostname, List.of(), flavor));