X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=saltstack-adapter%2Fsaltstack-adapter-provider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fccsdk%2Fadapter%2Fimpl%2FTestSaltstackAdapterImpl.java;h=98137a8b96b9f388bfe023a0901586924db03f9a;hb=b08a1b8cf2440fac7fc3d7eb7580a58d977524a2;hp=48f5c20b8ac1f988b78eaffd0e4c18e868ef3bde;hpb=aeeba1d69f0498808252d5555b06b8fb6cae9269;p=ccsdk%2Fsli%2Fadaptors.git

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
@@ -825,6 +825,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");