diff options
author | Dan Timoney <dt5972@att.com> | 2018-07-17 14:13:09 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-07-17 14:13:09 +0000 |
commit | 70c4951d27f2c08b5a80ef7fa6d3f6e657993fe7 (patch) | |
tree | 785f4d2e5be42a03b6951df665fce8435c9289ca /saltstack-adapter/saltstack-adapter-provider/src/test/java | |
parent | d7b5fa70771282ec905a46c6e266dbdcef98a584 (diff) | |
parent | b08a1b8cf2440fac7fc3d7eb7580a58d977524a2 (diff) |
Merge "saltstack adaptor DGs addition"
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-provider/src/test/java')
-rw-r--r-- | saltstack-adapter/saltstack-adapter-provider/src/test/java/org/onap/ccsdk/adapter/impl/TestSaltstackAdapterImpl.java | 44 |
1 files changed, 36 insertions, 8 deletions
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 48f5c20b..98137a8b 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 @@ -826,6 +826,34 @@ public class TestSaltstackAdapterImpl { } @Test + public void reqExecCommand_shouldSetSuccessRealSLSCommand() throws SvcLogicException, + IllegalStateException, IllegalArgumentException { + + params.put("HostName", "<IP>"); + 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", "<IP>"); 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", "<IP>"); params.put("Port", "2222"); params.put("User", "root"); params.put("Password", "vagrant"); |