|
3 | 3 |
|
4 | 4 | package oracle.weblogic.kubernetes; |
5 | 5 |
|
| 6 | +import java.math.BigDecimal; |
6 | 7 | import java.util.HashMap; |
7 | 8 | import java.util.LinkedHashMap; |
8 | 9 | import java.util.List; |
@@ -147,26 +148,26 @@ public void testServerPodsRestartByChangingResource() { |
147 | 148 | } |
148 | 149 |
|
149 | 150 | // 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); |
152 | 153 |
|
153 | 154 | // verify if cpu limit was set then the new value should be different than the original value |
154 | 155 | if (limits.get("cpu") != null) { |
155 | | - assertNotEquals(limits.get("cpu").getNumber().toString(), cpuLimit, |
| 156 | + assertNotEquals(limits.get("cpu").getNumber().compareTo(cpuLimit), 0, |
156 | 157 | String.format("server pod compute resources cpu limit is already set to %s, set cpu limit to " |
157 | 158 | + "a different value", cpuLimit)); |
158 | 159 | } |
159 | 160 |
|
160 | 161 | // verify if cpu request was set then the new value should be different than the original value |
161 | 162 | if (requests.get("cpu") != null) { |
162 | | - assertNotEquals(requests.get("cpu").getNumber().toString(), cpuRequest, |
| 163 | + assertNotEquals(requests.get("cpu").getNumber().compareTo(cpuRequest), 0, |
163 | 164 | String.format("server pod compute resources cpu request is already set to %s, set cpu request to " |
164 | 165 | + "a different value", cpuRequest)); |
165 | 166 | } |
166 | 167 |
|
167 | 168 | // add/modify the server pod resources by patching the domain custom resource |
168 | 169 | 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", |
170 | 171 | domainUid, domainNamespace)); |
171 | 172 |
|
172 | 173 | // verify the server pods are rolling restarted and back to ready state |
@@ -198,24 +199,24 @@ public void testServerPodsRestartByChangingResource() { |
198 | 199 | // verify the server pod resources limits got updated |
199 | 200 | logger.info("Checking that the server pod resources cpu limit was updated correctly"); |
200 | 201 | 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, |
202 | 203 | 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())); |
204 | 205 |
|
205 | 206 | // get new server pod compute resources requests |
206 | 207 | requests = domain1.getSpec().getServerPod().getResources().getRequests(); |
207 | 208 | assertNotNull(requests, domain1 + "/spec/serverPod/resources/requests is null"); |
208 | 209 |
|
209 | 210 | // print out server pod compute resource requests |
210 | 211 | 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())); |
212 | 213 |
|
213 | 214 | // verify the server pod resources requests got updated |
214 | 215 | logger.info("Checking that the server pod resources cpu request is updated correctly"); |
215 | 216 | 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, |
217 | 218 | 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())); |
219 | 220 | } |
220 | 221 |
|
221 | 222 | /** |
@@ -321,7 +322,7 @@ private static void createAndVerifyMiiDomain() { |
321 | 322 | * @param cpuRequest cpu request to be added to domain spec serverPod resources requests |
322 | 323 | * @return true if patching domain custom resource is successful, false otherwise |
323 | 324 | */ |
324 | | - private boolean addServerPodResources(String cpuLimit, String cpuRequest) { |
| 325 | + private boolean addServerPodResources(BigDecimal cpuLimit, BigDecimal cpuRequest) { |
325 | 326 | // construct the patch string for adding server pod resources |
326 | 327 | StringBuffer patchStr = new StringBuffer("[{") |
327 | 328 | .append("\"op\": \"add\", ") |
|
0 commit comments