changing mock iaas /init api to /status
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b7e6d3b5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b7e6d3b5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b7e6d3b5 Branch: refs/heads/stratos-4.1.x Commit: b7e6d3b521af61a738fba7176c766b98a133358c Parents: 7104857 Author: rajkumar <[email protected]> Authored: Sat Nov 21 20:41:44 2015 +0530 Committer: rajkumar <[email protected]> Committed: Sat Nov 21 20:41:44 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/mock/iaas/api/MockIaasApi.java | 2 +- .../apache/stratos/mock/iaas/client/MockIaasApiClient.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e6d3b5/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java index c9a04c3..37b476a 100644 --- a/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java +++ b/components/org.apache.stratos.mock.iaas.api/src/main/java/org/apache/stratos/mock/iaas/api/MockIaasApi.java @@ -52,7 +52,7 @@ public class MockIaasApi { } @GET - @Path("/init") + @Path("/status") @Produces("application/json") public Response init() throws MockIaasApiException { http://git-wip-us.apache.org/repos/asf/stratos/blob/b7e6d3b5/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java index 571d082..88dbe97 100644 --- a/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java +++ b/components/org.apache.stratos.mock.iaas.client/src/main/java/org/apache/stratos/mock/iaas/client/MockIaasApiClient.java @@ -39,7 +39,7 @@ public class MockIaasApiClient { private static final Log log = LogFactory.getLog(MockIaasApiClient.class); private static final String INSTANCES_CONTEXT = "/instances/"; - private static final String INIT_CONTEXT = "/init"; + private static final String INIT_CONTEXT = "/status"; private RestClient restClient; private String endpoint; @@ -53,10 +53,7 @@ public class MockIaasApiClient { try { URI uri = new URIBuilder(endpoint + INIT_CONTEXT).build(); HttpResponse response = restClient.doGet(uri); - if (response != null) { - return response.getStatusCode() == 200; - } - throw new RuntimeException("An unknown error occurred"); + return response != null && response.getStatusCode() == 200; } catch (Exception e) { String message = "Could not check whether mock-iaas is active"; throw new RuntimeException(message, e);
