From 586edec7ac3e0b56de5a243ede08564a534f4f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Sat, 28 Apr 2018 02:07:51 +0200 Subject: [PATCH] CLOUDSTACK-10253: JSON response for SuccessResponse as boolean instead of string (#2428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * JSON response for SuccessResponse as boolean instead of string Signed-off-by: Marc-Aurèle Brothier * Fixing test cases --- .../com/cloud/api/response/ApiResponseSerializer.java | 8 ++------ test/integration/smoke/test_hostha_simulator.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java index 2b9717de1e2..c72f957e99b 100644 --- a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java @@ -131,12 +131,8 @@ public class ApiResponseSerializer { sb.append("}"); log.append("}"); } - } else if (result instanceof SuccessResponse) { - sb.append("{\"success\":\"").append(((SuccessResponse)result).getSuccess()).append("\"}"); - log.append("{\"success\":\"").append(((SuccessResponse)result).getSuccess()).append("\"}"); - } else if (result instanceof ExceptionResponse) { - String jsonErrorText = responseBuilder.toJson(result); - jsonErrorText = unescape(jsonErrorText); + } else if (result instanceof SuccessResponse || result instanceof ExceptionResponse) { + final String jsonErrorText = unescape(responseBuilder.toJson(result)); sb.append(jsonErrorText); log.append(jsonErrorText); } else { diff --git a/test/integration/smoke/test_hostha_simulator.py b/test/integration/smoke/test_hostha_simulator.py index 4dfb9e9ba6c..bb25d477d02 100644 --- a/test/integration/smoke/test_hostha_simulator.py +++ b/test/integration/smoke/test_hostha_simulator.py @@ -161,7 +161,7 @@ class TestHostHA(cloudstackTestCase): cmd.recover = recover cmd.fence = fence response = self.apiclient.configureSimulatorHAProviderState(cmd) - self.assertEqual(response.success, 'true') + self.assertEqual(response.success, True) def getSimulatorHAStateTransitions(self, hostId):