Skip to content

Commit 4ced09a

Browse files
committed
Backport BigDecimal fix for ItPodsRestart
1 parent f832231 commit 4ced09a

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItPodsRestart.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package oracle.weblogic.kubernetes;
55

6+
import java.math.BigDecimal;
67
import java.util.HashMap;
78
import java.util.LinkedHashMap;
89
import java.util.List;
@@ -147,26 +148,26 @@ public void testServerPodsRestartByChangingResource() {
147148
}
148149

149150
// add the new server pod compute resources limits: cpu: 1, requests: cpu: 0.5
150-
String cpuLimit = "1";
151-
String cpuRequest = "0.5";
151+
BigDecimal cpuLimit = new BigDecimal(1);
152+
BigDecimal cpuRequest = new BigDecimal(0.5);
152153

153154
// verify if cpu limit was set then the new value should be different than the original value
154155
if (limits.get("cpu") != null) {
155-
assertNotEquals(limits.get("cpu").getNumber().toString(), cpuLimit,
156+
assertNotEquals(limits.get("cpu").getNumber().compareTo(cpuLimit), 0,
156157
String.format("server pod compute resources cpu limit is already set to %s, set cpu limit to "
157158
+ "a different value", cpuLimit));
158159
}
159160

160161
// verify if cpu request was set then the new value should be different than the original value
161162
if (requests.get("cpu") != null) {
162-
assertNotEquals(requests.get("cpu").getNumber().toString(), cpuRequest,
163+
assertNotEquals(requests.get("cpu").getNumber().compareTo(cpuRequest), 0,
163164
String.format("server pod compute resources cpu request is already set to %s, set cpu request to "
164165
+ "a different value", cpuRequest));
165166
}
166167

167168
// add/modify the server pod resources by patching the domain custom resource
168169
assertTrue(addServerPodResources(cpuLimit, cpuRequest),
169-
String.format("Failed to add server pod compute resources for domain {0} in namespace {1}",
170+
String.format("Failed to add server pod compute resources for domain %s in namespace %s",
170171
domainUid, domainNamespace));
171172

172173
// verify the server pods are rolling restarted and back to ready state
@@ -198,24 +199,24 @@ public void testServerPodsRestartByChangingResource() {
198199
// verify the server pod resources limits got updated
199200
logger.info("Checking that the server pod resources cpu limit was updated correctly");
200201
assertNotNull(limits.get("cpu"), domain1 + "/spec/serverPod/resources/limits/cpu is null");
201-
assertEquals(limits.get("cpu").getNumber().toString(), cpuLimit,
202+
assertEquals(limits.get("cpu").getNumber().compareTo(cpuLimit), 0,
202203
String.format("server pod compute resource limits were not updated correctly, set cpu limit to %s, got %s",
203-
cpuLimit, limits.get("cpu").getNumber().toString()));
204+
cpuLimit, limits.get("cpu").getNumber()));
204205

205206
// get new server pod compute resources requests
206207
requests = domain1.getSpec().getServerPod().getResources().getRequests();
207208
assertNotNull(requests, domain1 + "/spec/serverPod/resources/requests is null");
208209

209210
// print out server pod compute resource requests
210211
logger.info("New value for server pod compute resource requests:");
211-
requests.forEach((key, value) -> logger.info(key + ": " + value.getNumber().toString()));
212+
requests.forEach((key, value) -> logger.info(key + ": " + value.getNumber()));
212213

213214
// verify the server pod resources requests got updated
214215
logger.info("Checking that the server pod resources cpu request is updated correctly");
215216
assertNotNull(requests.get("cpu"), domain1 + "/spec/serverPod/resources/requests/cpu is null");
216-
assertEquals(requests.get("cpu").getNumber().toString(), cpuRequest,
217+
assertEquals(requests.get("cpu").getNumber().compareTo(cpuRequest), 0,
217218
String.format("server pod compute resources requests was not updated correctly, set cpu request to %s, got %s",
218-
cpuRequest, requests.get("cpu").getNumber().toString()));
219+
cpuRequest, requests.get("cpu").getNumber()));
219220
}
220221

221222
/**
@@ -321,7 +322,7 @@ private static void createAndVerifyMiiDomain() {
321322
* @param cpuRequest cpu request to be added to domain spec serverPod resources requests
322323
* @return true if patching domain custom resource is successful, false otherwise
323324
*/
324-
private boolean addServerPodResources(String cpuLimit, String cpuRequest) {
325+
private boolean addServerPodResources(BigDecimal cpuLimit, BigDecimal cpuRequest) {
325326
// construct the patch string for adding server pod resources
326327
StringBuffer patchStr = new StringBuffer("[{")
327328
.append("\"op\": \"add\", ")

0 commit comments

Comments
 (0)