Cherry pick cl/214534911
Rework CompareMachineSize so that it will return -1 if any element is
smaller, it will return 0 if all are equal, will return 1 if all are
equal or greater.
Bug: None
Test: m acloud_test && acloud_test
Change-Id: Icc07b0c52c1218e33a71a512bf70b2304a7e168a
diff --git a/internal/lib/gcompute_client_test.py b/internal/lib/gcompute_client_test.py
index 11a49a9..dc9a44f 100644
--- a/internal/lib/gcompute_client_test.py
+++ b/internal/lib/gcompute_client_test.py
@@ -910,8 +910,20 @@
machine_info_2 = {"guestCpus": 10, "memoryMb": 200}
self._CompareMachineSizeTestHelper(machine_info_1, machine_info_2, -1)
+ def testCompareMachineSizeSmallSmallerOnSecond(self):
+ """Test CompareMachineSize where the first one is smaller."""
+ machine_info_1 = {"guestCpus": 11, "memoryMb": 100}
+ machine_info_2 = {"guestCpus": 10, "memoryMb": 200}
+ self._CompareMachineSizeTestHelper(machine_info_1, machine_info_2, -1)
+
def testCompareMachineSizeLarge(self):
"""Test CompareMachineSize where the first one is larger."""
+ machine_info_1 = {"guestCpus": 11, "memoryMb": 200}
+ machine_info_2 = {"guestCpus": 10, "memoryMb": 100}
+ self._CompareMachineSizeTestHelper(machine_info_1, machine_info_2, 1)
+
+ def testCompareMachineSizeLargeWithEqualElement(self):
+ """Test CompareMachineSize where the first one is larger."""
machine_info_1 = {"guestCpus": 10, "memoryMb": 200}
machine_info_2 = {"guestCpus": 10, "memoryMb": 100}
self._CompareMachineSizeTestHelper(machine_info_1, machine_info_2, 1)