From f8ebec657389d40a88442b5a9be1a18254bbdbfd Mon Sep 17 00:00:00 2001 From: Ganesh Chandrasekaran Date: Wed, 18 Jul 2018 15:27:52 +0900 Subject: saltstack to take env and file param Issue-ID: CCSDK-383 Change-Id: Id069d77d8f11203a2f604470c116bcf3cc618c2f Signed-off-by: Ganesh Chandrasekaran --- .../ccsdk/adapter/impl/TestConnectionBuilder.java | 8 +- .../adapter/impl/TestSaltstackAdapterImpl.java | 309 +++++++++++++++------ ...TestSaltstackAdapterPropertiesProviderImpl.java | 8 +- .../onap/ccsdk/adapter/model/TestJsonParser.java | 2 +- 4 files changed, 233 insertions(+), 94 deletions(-) (limited to 'saltstack-adapter/saltstack-adapter-provider/src/test/java') diff --git a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestConnectionBuilder.java b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestConnectionBuilder.java index 933f3fcf7..266147aad 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestConnectionBuilder.java +++ b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestConnectionBuilder.java @@ -1,10 +1,10 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APPC + * ONAP : CCSDK * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018 Samsung Electronics. All rights reserved. * ================================================================================ - * Copyright (C) 2017 Amdocs + * * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * ============LICENSE_END========================================================= */ 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 50bf75826..a0d36046c 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 @@ -1,10 +1,10 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APPC + * ONAP : CCSDK * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018 Samsung Electronics. All rights reserved. * ================================================================================ - * Copyright (C) 2017 Amdocs + * * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * ============LICENSE_END========================================================= */ @@ -158,8 +158,8 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); try { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -181,8 +181,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("retryDelay", "10"); params.put("retryCount", "10"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); try { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -204,8 +204,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("retryDelay", "0"); params.put("retryCount", "0"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); try { adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -227,8 +227,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("retryDelay", "-1"); params.put("retryCount", "-1"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); try { adapter.reqExecCommand(params, svcContext); @@ -248,8 +248,8 @@ public class TestSaltstackAdapterImpl { params.put("Port", "10"); params.put("User", "test"); params.put("Password", "test"); - params.put("cmd", "test"); - params.put("slsExec", "test"); + params.put("Cmd", "test"); + params.put("SlsExec", "test"); params.put("Test", "fail"); try { adapter.reqExecCommand(params, svcContext); @@ -272,8 +272,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("fileName", "src/test/resources/test.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -293,8 +293,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("slsExec", "true"); + params.put("Cmd", "test"); + params.put("SlsExec", "true"); adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -314,8 +314,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("fileName", "src/test/resources/test.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("slsExec", "true"); + params.put("Cmd", "test"); + params.put("SlsExec", "true"); adapter.reqExecCommand(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -333,8 +333,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("fileName", "src/test/resources/test.txt"); params.put("Id", "txt"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -354,8 +354,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("fileName", "src/test/resources/test"); params.put("Id", "txt"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -375,8 +375,8 @@ public class TestSaltstackAdapterImpl { params.put("Test", "success"); params.put("fileName", "src/test/resources/test-invalid.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -409,8 +409,8 @@ public class TestSaltstackAdapterImpl { params.put("Password", "test"); params.put("Test", "success"); params.put("fileName", "src/test/resources/test.json"); - params.put("cmd", "test"); - params.put("slsExec", "false"); + params.put("Cmd", "test"); + params.put("SlsExec", "false"); adapter.reqExecCommand(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -427,10 +427,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.sls"); + params.put("SlsFile", "src/test/resources/test.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); + params.put("Cmd", "test"); adapter.reqExecSLSFile(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -448,7 +448,7 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test-none.sls"); + params.put("SlsFile", "src/test/resources/test-none.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); @@ -466,7 +466,7 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test-none"); + params.put("SlsFile", "src/test/resources/test-none"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); @@ -484,7 +484,7 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.json"); + params.put("SlsFile", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-none.json"); params.put("Id", "test1"); @@ -502,11 +502,11 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.json"); + params.put("SlsFile", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("applyTo", "minion1"); + params.put("Cmd", "test"); + params.put("NodeList", "minion1"); adapter.reqExecSLSFile(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -524,11 +524,11 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.sls"); + params.put("SlsFile", "src/test/resources/test.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("applyTo", "minion1"); + params.put("Cmd", "test"); + params.put("NodeList", "minion1"); adapter.reqExecSLSFile(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -546,10 +546,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test-none.json"); + params.put("SlsFile", "src/test/resources/test-none.json"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("applyTo", "minion1"); + params.put("NodeList", "minion1"); adapter.reqExecSLSFile(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -565,10 +565,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.json"); + params.put("SlsFile", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-none.json"); params.put("Id", "test1"); - params.put("applyTo", "minion1"); + params.put("NodeList", "minion1"); adapter.reqExecSLSFile(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -584,11 +584,11 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.sls"); + params.put("SlsFile", "src/test/resources/test.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("applyTo", "*"); + params.put("Cmd", "test"); + params.put("NodeList", "*"); adapter.reqExecSLSFile(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -606,10 +606,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test-none.json"); + params.put("SlsFile", "src/test/resources/test-none.json"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("applyTo", "*"); + params.put("NodeList", "*"); adapter.reqExecSLSFile(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -625,10 +625,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsFile", "src/test/resources/test.json"); + params.put("SlsFile", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-none.json"); params.put("Id", "test1"); - params.put("applyTo", "*"); + params.put("NodeList", "*"); adapter.reqExecSLSFile(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -645,10 +645,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test.sls"); + params.put("SlsName", "src/test.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); + params.put("Cmd", "test"); adapter.reqExecSLS(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -666,10 +666,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test"); + params.put("SlsName", "src/test"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); + params.put("Cmd", "test"); adapter.reqExecSLS(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -687,7 +687,7 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test/resources/test.json"); + params.put("SlsName", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-none.json"); params.put("Id", "test1"); @@ -706,11 +706,11 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test/resources/test.sls"); + params.put("SlsName", "src/test/resources/test.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("applyTo", "minion1"); + params.put("Cmd", "test"); + params.put("NodeList", "minion1"); adapter.reqExecSLS(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -729,10 +729,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test/resources/test.json"); + params.put("SlsName", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-none.json"); params.put("Id", "test1"); - params.put("applyTo", "minion1"); + params.put("NodeList", "minion1"); adapter.reqExecSLS(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -748,11 +748,11 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test/resources/test.sls"); + params.put("SlsName", "src/test/resources/test.sls"); params.put("fileName", "src/test/resources/test-sls.json"); params.put("Id", "test1"); - params.put("cmd", "test"); - params.put("applyTo", "*"); + params.put("Cmd", "test"); + params.put("NodeList", "*"); adapter.reqExecSLS(params, svcContext); String status = svcContext.getAttribute("org.onap.appc.adapter.saltstack.result.code"); @@ -771,10 +771,10 @@ public class TestSaltstackAdapterImpl { params.put("User", "test"); params.put("Password", "test"); params.put("Test", "success"); - params.put("slsName", "src/test/resources/test.json"); + params.put("SlsName", "src/test/resources/test.json"); params.put("fileName", "src/test/resources/test-none.json"); params.put("Id", "test1"); - params.put("applyTo", "*"); + params.put("NodeList", "*"); adapter.reqExecSLS(params, svcContext); TestId = svcContext.getAttribute("org.onap.appc.adapter.saltstack.Id"); @@ -791,9 +791,9 @@ public class TestSaltstackAdapterImpl { params.put("User", "sdn"); params.put("Password", "foo"); params.put("Id", "test1"); - params.put("cmd", "ls -l"); - params.put("slsExec", "false"); - params.put("execTimeout", "12000"); + params.put("Cmd", "ls -l"); + params.put("SlsExec", "false"); + params.put("Timeout", "120"); adapter = new SaltstackAdapterImpl(); try { adapter.reqExecCommand(params, svcContext); @@ -803,7 +803,7 @@ public class TestSaltstackAdapterImpl { assertEquals(TestId, "test1"); } catch (Exception e){ //if local ssh is not enabled - return; + System.out.print(e.getMessage()); } } @@ -816,9 +816,9 @@ public class TestSaltstackAdapterImpl { 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"); + params.put("Cmd", "salt '*' test.ping --out=json --static"); + params.put("SlsExec", "false"); + params.put("Timeout", "120"); adapter = new SaltstackAdapterImpl(); try { @@ -831,7 +831,7 @@ public class TestSaltstackAdapterImpl { assertEquals(TestId, "true"); } catch (Exception e){ //if saltstack ssh IP is not enabled - return; + System.out.print(e.getMessage()); } } @@ -844,9 +844,9 @@ public class TestSaltstackAdapterImpl { params.put("User", "root"); params.put("Password", "vagrant"); params.put("Id", "test1"); - params.put("cmd", "cd /srv/salt/; salt '*' state.apply vim --out=json --static"); - params.put("slsExec", "true"); - params.put("execTimeout", "12000"); + params.put("Cmd", "cd /srv/salt/; salt '*' state.apply vim --out=json --static"); + params.put("SlsExec", "true"); + params.put("Timeout", "120"); adapter = new SaltstackAdapterImpl(); try { @@ -857,7 +857,7 @@ public class TestSaltstackAdapterImpl { assertEquals(TestId, "test1"); } catch (Exception e){ //if saltstack ssh IP is not enabled - return; + System.out.print(e.getMessage()); } } @@ -870,9 +870,64 @@ public class TestSaltstackAdapterImpl { params.put("User", "root"); params.put("Password", "vagrant"); params.put("Id", "test1"); - params.put("slsName", "vim"); - params.put("execTimeout", "12000"); - params.put("applyTo", "minion1"); + params.put("SlsName", "vim"); + params.put("Timeout", "120"); + params.put("NodeList", "minion1"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(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"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessEnvParam() 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("SlsName", "vim"); + params.put("Timeout", "120"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": bar*}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(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"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessFileParam() 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("SlsName", "vim"); + params.put("Timeout", "120"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": \"bar,baz\"}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); adapter = new SaltstackAdapterImpl(); try { @@ -883,7 +938,63 @@ public class TestSaltstackAdapterImpl { assertEquals(TestId, "test1"); } catch (Exception e){ //if saltstack ssh IP is not enabled - return; + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessPillarParam() 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("SlsName", "vim"); + params.put("Timeout", "120"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": \"bar,baz\", \"pillar\":\"'{\\\"foo\\\": \\\"bar\\\"}'\"}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(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"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessMultiFileParam() 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("SlsName", "vim"); + params.put("Timeout", "120"); + params.put("NodeList", "minion1"); + params.put("EnvParameters", "{\"exclude\": bar*}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\" , \"config-tep.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLS(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"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); } } @@ -896,9 +1007,37 @@ public class TestSaltstackAdapterImpl { params.put("User", "root"); params.put("Password", "vagrant"); params.put("Id", "test1"); - params.put("execTimeout", "12000"); - params.put("applyTo", "minion1"); - params.put("slsFile", "src/test/resources/config.sls"); + params.put("Timeout", "120"); + params.put("NodeList", "minion1"); + params.put("SlsFile", "src/test/resources/config.sls"); + + adapter = new SaltstackAdapterImpl(); + try { + adapter.reqExecSLSFile(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"); + } catch (Exception e){ + //if saltstack ssh IP is not enabled + System.out.print(e.getMessage()); + } + } + + @Test + public void reqExecCommand_shouldSetSuccessSSLFileMultiFileParam() 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("Timeout", "120"); + params.put("NodeList", "minion1"); + params.put("SlsFile", "src/test/resources/config.sls"); + params.put("EnvParameters", "{\"exclude\": bar, \"pillar\":\"'{\\\"foo\\\": \\\"bar\\\"}'\"}"); + params.put("FileParameters", "{\"config.txt\":\"db_ip=10.1.1.1, sip_timer=10000\" , \"config-tep.txt\":\"db_ip=10.1.1.1, sip_timer=10000\"}"); adapter = new SaltstackAdapterImpl(); try { @@ -909,7 +1048,7 @@ public class TestSaltstackAdapterImpl { assertEquals(TestId, "test1"); } catch (Exception e){ //if saltstack ssh IP is not enabled - return; + System.out.print(e.getMessage()); } } } diff --git a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterPropertiesProviderImpl.java b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterPropertiesProviderImpl.java index d5699c4c9..deb46534f 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterPropertiesProviderImpl.java +++ b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterPropertiesProviderImpl.java @@ -1,10 +1,10 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APPC + * ONAP : CCSDK * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018 Samsung Electronics. All rights reserved. * ================================================================================ - * Copyright (C) 2017 Amdocs + * * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * ============LICENSE_END========================================================= */ diff --git a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/model/TestJsonParser.java b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/model/TestJsonParser.java index 74e7ed0c4..ed1e02c4e 100644 --- a/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/model/TestJsonParser.java +++ b/saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/model/TestJsonParser.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * openECOMP : SDN-C * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights + * Copyright (C) 2018 Samsung Electronics. All rights * reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); -- cgit 1.2.3-korg