ansible chnages for adding configdata and bugfixes

Change-Id: Ide9528baa569815198b18951af7f355c7c7e54d8
Issue-ID: APPC-1786
Signed-off-by: Modaboina, Kusumakumari (km583p) <km583p@att.com>

2 files changed, 40 insertions, 6 deletions

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 02048aee3..8e13a66ea 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
@@ -60,8 +60,8 @@ public class TestAnsibleAdapterImpl {
     private static final String STATUS_CODE = "StatusCode";
     private static final String STATUS_MESSAGE = "StatusMessage";
     private static final String PENDING = "100";
-    private static final String SUCCESS = "200";
-
+    private static final String SUCCESS = "SUCCESS";
+    private static final String MESSAGE_ATTRIBUTE_NAME = "SUCCESS";
     private AnsibleAdapterImpl adapter;
     private boolean testMode = true;
     private Map<String, String> params;
@@ -109,6 +109,7 @@ public class TestAnsibleAdapterImpl {
         result = new AnsibleResult();
         result.setStatusMessage("Success");
         result.setResults("Success");
+        result.setOutput("{}");
         Whitebox.setInternalState(adapter, "messageProcessor", messageProcessor);
         spyAdapter = Mockito.spy(adapter);
     }
@@ -150,16 +151,15 @@ public class TestAnsibleAdapterImpl {
      * @throws APPCException
      *             If the request cannot be processed for some reason
      */
-    @Test
+   @Test(expected = SvcLogicException.class)
     public void reqExecResult_shouldSetSuccess() throws SvcLogicException, APPCException {
         params.put("Id", "100");
-        result.setStatusCode(Integer.valueOf(SUCCESS));
+        result.setStatusMessage(SUCCESS);
         when(messageProcessor.reqUriResult(params)).thenReturn(agentUrl);
         when(messageProcessor.parseGetResponse(anyString())).thenReturn(result);
         spyAdapter.reqExecResult(params, svcContext);
-        assertEquals("400", svcContext.getAttribute(RESULT_CODE_ATTRIBUTE_NAME));
+        assertEquals(SUCCESS, svcContext.getAttribute(MESSAGE_ATTRIBUTE_NAME));
     }
-
     /**
      * This test case is used to test the Failure of the request
      *
@@ -174,6 +174,10 @@ public class TestAnsibleAdapterImpl {
         params.put("Id", "100");
         result.setStatusCode(100);
         result.setStatusMessage("Failed");
+        JSONObject cData = new JSONObject();
+        cData.put("GatewayInfo", "Radius");
+        result.setconfigData(cData.toString());
+        result.setOutput(cData.toString());
         when(messageProcessor.reqUriResult(params)).thenReturn(agentUrl);
         when(messageProcessor.parseGetResponse(anyString())).thenReturn(result);
         adapter.reqExecResult(params, svcContext);
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/model/TestAnsibleMessageParser.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/model/TestAnsibleMessageParser.java
index 6d2e7bbf1..90bff6451 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/model/TestAnsibleMessageParser.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/model/TestAnsibleMessageParser.java
@@ -165,8 +165,10 @@ public class TestAnsibleMessageParser {
         params.put("Password", "TestPassword");
         params.put("Timeout", "3");
         params.put("Version", "1");
+        params.put("InventoryNames", "VNFC");
         JSONObject jObject = msgParser.reqMessage(params);
         assertEquals("1", jObject.get("Version"));
+        assertEquals("VNFC",jObject.get("InventoryNames"));
     }
 
     @Test
@@ -183,6 +185,34 @@ public class TestAnsibleMessageParser {
         assertEquals("TestUser",result.get("User"));
         assertEquals("TestPassword",result.get("Password"));
     }
+
+    @Test
+    public void TestParseGetConfigResponseResult() throws Exception {
+        AnsibleResult ansibleResult;
+        String input = "{\"StatusCode\":\"200\",\"StatusMessage\":\"TestMessage\",\"Results\":{\"host\":{\"StatusCode\":\"200\",\"StatusMessage\":\"SUCCESS\",\"Output\":{\"info\":{\"configData\":{\"abc\":\"TestOutPutResult\",\"rtr\":\"vfc\"}}}}}}";
+        ansibleResult = msgParser.parseGetResponse(input);
+        String result = "abc";
+        assertEquals(true, ansibleResult.getconfigData().contains(result));
+    }
+
+    @Test
+    public void testParseOptionalParamTest2() throws Exception {
+        
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("AgentUrl", "TestAgentUrl");
+        params.put("PlaybookName", "TestPlaybookName");
+        params.put("User", "TestUser");
+        params.put("Password", "TestPassword");
+        //params.put("Timeout", "3");
+        params.put("Version", "1");
+        params.put("InventoryNames", "VNFC");
+        params.put("Timeout", "4");
+        params.put("EnvParameters", "{ \"userID\": \"$0002\", \"vnf-type\" : \"\", \"vnf\" : \"abc\" }");
+        params.put("NodeList", "${Nodelist}");
+        JSONObject jObject = msgParser.reqMessage(params);
+        assertEquals("1", jObject.get("Version"));
+        assertEquals("4",jObject.get("Timeout"));
+    }
     
     @Test
     public void testReqUriResultWithIPs() throws Exception {