From: Shailendra Borale Date: Thu, 2 Aug 2018 20:00:22 +0000 (-0400) Subject: Changed Code and DGs to return detailed response. X-Git-Tag: 1.4.0~135 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc.git;a=commitdiff_plain;h=f835229fe69a79fdfa08c64615733007f826d37b Changed Code and DGs to return detailed response. Added comment and used String instead of Integer.toString Change-Id: I07a0a7752b225fbf50d761b489b9320b47fcc71d Issue-ID: APPC-1013 Signed-off-by: sb8915 --- diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/AnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/AnsibleAdapterImpl.java index b9cdbc6bb..ae0b8594f 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/AnsibleAdapterImpl.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/main/java/org/onap/appc/adapter/ansible/impl/AnsibleAdapterImpl.java @@ -77,6 +77,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter { private static final String RESULT_CODE_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.result.code"; private static final String MESSAGE_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.message"; private static final String RESULTS_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.results"; + private static final String OUTPUT_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.output"; private static final String ID_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.Id"; private static final String LOG_ATTRIBUTE_NAME = "org.onap.appc.adapter.ansible.log"; @@ -317,6 +318,7 @@ public class AnsibleAdapterImpl implements AnsibleAdapter { int code = -1; String message = StringUtils.EMPTY; String results = StringUtils.EMPTY; + String output = StringUtils.EMPTY; try { // Try to retrieve the test results (modify the URL for that) @@ -324,13 +326,14 @@ public class AnsibleAdapterImpl implements AnsibleAdapter { code = testResult.getStatusCode(); message = testResult.getStatusMessage(); - if (code == 200) { + if (code == 200 || code == 400 || "FINISHED".equalsIgnoreCase(message)) { logger.info("Parsing response from Server = " + message); // Valid HTTP. process the Ansible message testResult = messageProcessor.parseGetResponse(message); code = testResult.getStatusCode(); message = testResult.getStatusMessage(); results = testResult.getResults(); + output = testResult.getOutput(); } logger.info("Request response = " + message); @@ -350,13 +353,16 @@ public class AnsibleAdapterImpl implements AnsibleAdapter { logger.info(String.format("Ansible Request %s finished with Result %s, Message = %s", params.get("Id"), OUTCOME_FAILURE, message)); ctx.setAttribute(RESULTS_ATTRIBUTE_NAME, results); + ctx.setAttribute(OUTPUT_ATTRIBUTE_NAME, output); doFailure(ctx, code, message); return; } - ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(code)); + // In case of 200,400,FINISHED return 400 + ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, "400"); ctx.setAttribute(MESSAGE_ATTRIBUTE_NAME, message); ctx.setAttribute(RESULTS_ATTRIBUTE_NAME, results); + ctx.setAttribute(OUTPUT_ATTRIBUTE_NAME, output); ctx.setStatus(OUTCOME_SUCCESS); } diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java index 7898260d1..7ba34e942 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/impl/TestAnsibleAdapterImpl.java @@ -150,7 +150,7 @@ public class TestAnsibleAdapterImpl { when(messageProcessor.reqUriResult(params)).thenReturn(agentUrl); when(messageProcessor.parseGetResponse(anyString())).thenReturn(result); spyAdapter.reqExecResult(params, svcContext); - assertEquals(SUCCESS, svcContext.getAttribute(RESULT_CODE_ATTRIBUTE_NAME)); + assertEquals("400", svcContext.getAttribute(RESULT_CODE_ATTRIBUTE_NAME)); } /** diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json index 7a22ddfa2..6354ffab7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DGOrchestrator.json @@ -183,7 +183,7 @@ "id": "ca5807aa.f436", "type": "set", "name": "set error-code 401 and message", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", "x": 2459.99755859375, "y": 347.3666076660156, @@ -723,4 +723,4 @@ "z": "5f45af23.e79db", "wires": [] } -] \ No newline at end of file +] diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json index 05e733f86..b3069cdb7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_Generic_AnsibleDG.json @@ -286,7 +286,7 @@ "id": "fb756701.8cc94", "type": "returnFailure", "name": "return failure", - "xml": "\n\n", + "xml": "\n\n\n", "comments": "", "x": 1050.9717254638672, "y": 762.2043304443359, @@ -481,11 +481,11 @@ "id": "5ce0b58c.6872f4", "type": "set", "name": "set payloadResponse", - "xml": "\n\n\n", + "xml": "\n\n\n", "comments": "", "x": 837, "y": 971, "z": "23466936.d3b346", "wires": [] } -] \ No newline at end of file +] diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json index 9586002f3..ec7151a8c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ansible-adapter-1.0.json @@ -37,7 +37,7 @@ "id": "53079a4f.559f84", "type": "returnFailure", "name": "return failure", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n