apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-10253: JSON response for SuccessResponse as boolean instead of string (#2428)

Browse Source 
* JSON response for SuccessResponse as boolean instead of string

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>

* Fixing test cases
This commit is contained in:
Marc-Aurèle Brothier 2018-04-28 02:07:51 +02:00 committed by Rafael Weingärtner
parent e4537e9d39
commit 586edec7ac
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java
View File

@ -131,12 +131,8 @@ public class ApiResponseSerializer {
sb.append("}"); sb.append("}");
log.append("}"); log.append("}");
} }
} else if (result instanceof SuccessResponse) { } else if (result instanceof SuccessResponse || result instanceof ExceptionResponse) {
sb.append("{\"success\":\"").append(((SuccessResponse)result).getSuccess()).append("\"}"); final String jsonErrorText = unescape(responseBuilder.toJson(result));
log.append("{\"success\":\"").append(((SuccessResponse)result).getSuccess()).append("\"}");
} else if (result instanceof ExceptionResponse) {
String jsonErrorText = responseBuilder.toJson(result);
jsonErrorText = unescape(jsonErrorText);
sb.append(jsonErrorText); sb.append(jsonErrorText);
log.append(jsonErrorText); log.append(jsonErrorText);
} else { } else {

2
test/integration/smoke/test_hostha_simulator.py
View File

@ -161,7 +161,7 @@ class TestHostHA(cloudstackTestCase):
cmd.recover = recover cmd.recover = recover
cmd.fence = fence cmd.fence = fence
response = self.apiclient.configureSimulatorHAProviderState(cmd) response = self.apiclient.configureSimulatorHAProviderState(cmd)
self.assertEqual(response.success, 'true') self.assertEqual(response.success, True)
def getSimulatorHAStateTransitions(self, hostId): def getSimulatorHAStateTransitions(self, hostId):