You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2018/04/28 00:07:59 UTC
[cloudstack] branch master updated: CLOUDSTACK-10253: JSON response
for SuccessResponse as boolean instead of string (#2428)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 586edec CLOUDSTACK-10253: JSON response for SuccessResponse as boolean instead of string (#2428)
586edec is described below
commit 586edec7ac3e0b56de5a243ede08564a534f4f89
Author: Marc-Aurèle Brothier <m...@brothier.org>
AuthorDate: Sat Apr 28 02:07:51 2018 +0200
CLOUDSTACK-10253: JSON response for SuccessResponse as boolean instead of string (#2428)
* JSON response for SuccessResponse as boolean instead of string
Signed-off-by: Marc-Aurèle Brothier <m...@brothier.org>
* Fixing test cases
---
.../main/java/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 2b9717d..c72f957 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 4dfb9e9..bb25d47 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):
--
To stop receiving notification emails like this one, please contact
rafael@apache.org.