From b08a1b8cf2440fac7fc3d7eb7580a58d977524a2 Mon Sep 17 00:00:00 2001 From: Ganesh Chandrasekaran Date: Tue, 17 Jul 2018 11:02:17 +0900 Subject: saltstack adaptor DGs addition Issue-ID: CCSDK-368 Change-Id: I5f66693109c14eb64e4576caeeb84440a940fffa Signed-off-by: Ganesh Chandrasekaran --- .../saltstack/impl/SaltstackAdapterImpl.java | 12 ++---- .../adapter/impl/TestSaltstackAdapterImpl.java | 44 ++++++++++++++++++---- 2 files changed, 40 insertions(+), 16 deletions(-) (limited to 'saltstack-adapter/saltstack-adapter-provider') diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdapterImpl.java b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdapterImpl.java index e4bceb5ba..77874b0e5 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdapterImpl.java +++ b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdapterImpl.java @@ -292,13 +292,8 @@ public class SaltstackAdapterImpl implements SaltstackAdapter { return; } else { logger.info(String.format("Execution of request : successful.")); - if (slsExec) { - ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(testResult.getStatusCode())); - ctx.setAttribute(MESSAGE_ATTRIBUTE_NAME, "success"); - } else { - ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(SaltstackResultCodes.CHECK_CTX_FOR_CMD_SUCCESS.getValue())); - ctx.setAttribute(MESSAGE_ATTRIBUTE_NAME, "check context for execution status"); - } + ctx.setAttribute(RESULT_CODE_ATTRIBUTE_NAME, Integer.toString(testResult.getStatusCode())); + ctx.setAttribute(MESSAGE_ATTRIBUTE_NAME, "success"); ctx.setAttribute(ID_ATTRIBUTE_NAME, reqID); } } @@ -318,7 +313,8 @@ public class SaltstackAdapterImpl implements SaltstackAdapter { reqID = messageProcessor.reqId(params); String commandToExecute = messageProcessor.reqCmd(params); slsExec = messageProcessor.reqIsSLSExec(params); - testResult = execCommand(ctx, params, commandToExecute, -1); + long execTimeout = messageProcessor.reqExecTimeout(params); + testResult = execCommand(ctx, params, commandToExecute, execTimeout); testResult = messageProcessor.parseResponse(ctx, reqID, testResult, slsExec); checkResponseStatus(testResult, ctx, reqID, slsExec); } catch (IOException e) { diff --git a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterImpl.java b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterImpl.java index 48f5c20b8..98137a8b9 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterImpl.java +++ b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterImpl.java @@ -278,7 +278,7 @@ public class TestSaltstackAdapterImpl { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); - assertEquals("250", status); + assertEquals("200", status); assertEquals(TestId, "test1"); } @@ -339,7 +339,7 @@ public class TestSaltstackAdapterImpl { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); - assertEquals("250", status); + assertEquals("200", status); assertEquals(TestId, "txt"); } @@ -360,7 +360,7 @@ public class TestSaltstackAdapterImpl { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); - assertEquals("250", status); + assertEquals("200", status); assertEquals(TestId, "txt"); } @@ -381,7 +381,7 @@ public class TestSaltstackAdapterImpl { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); - assertEquals("250", status); + assertEquals("200", status); } @Test(expected = SvcLogicException.class) @@ -415,7 +415,7 @@ public class TestSaltstackAdapterImpl { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); - assertEquals("250", status); + assertEquals("200", status); } @Test @@ -817,7 +817,7 @@ public class TestSaltstackAdapterImpl { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); - assertEquals("250", status); + assertEquals("200", status); assertEquals(TestId, "test1"); } catch (Exception e){ //if local ssh is not enabled @@ -825,6 +825,34 @@ public class TestSaltstackAdapterImpl { } } + @Test + public void reqExecCommand_shouldSetSuccessRealSLSCommand() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", ""); + params.put("Port", "2222"); + params.put("User", "root"); + params.put("Password", "vagrant"); + params.put("Id", "test1"); + params.put("cmd", "salt '*' test.ping --out=json --static"); + params.put("slsExec", "false"); + params.put("execTimeout", "12000"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecCommand(params, svcContext); + String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); + TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); + assertEquals("200", status); + assertEquals(TestId, "test1"); + TestId = svcContext.getAttribute("test1.minion1"); + assertEquals(TestId, "true"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + return; + } + } + @Test public void reqExecCommand_shouldSetSuccessRealCommand() throws SvcLogicException, IllegalStateException, IllegalArgumentException { @@ -855,7 +883,7 @@ public class TestSaltstackAdapterImpl { public void reqExecCommand_shouldSetSuccessRealSSL() throws SvcLogicException, IllegalStateException, IllegalArgumentException { - params.put("HostName", "10.251.92.17"); + params.put("HostName", ""); params.put("Port", "2222"); params.put("User", "root"); params.put("Password", "vagrant"); @@ -881,7 +909,7 @@ public class TestSaltstackAdapterImpl { public void reqExecCommand_shouldSetSuccessSSLFile() throws SvcLogicException, IllegalStateException, IllegalArgumentException { - params.put("HostName", "10.251.92.17"); + params.put("HostName", ""); params.put("Port", "2222"); params.put("User", "root"); params.put("Password", "vagrant"); -- cgit 1.2.3-korg