2 files changed, 3 insertions, 24 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 50530ecd..22e8c208 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
@@ -179,8 +179,7 @@ public class TestSaltstackAdapterImpl {
         params.put("User", "test");
         params.put("Password", "test");
         params.put("Test", "success");
-        params.put("retryDelay", "10");
-        params.put("retryCount", "10");
+        params.put("withRetry", "true");
         params.put("Cmd", "test");
         params.put("SlsExec", "false");
         try {
@@ -202,8 +201,7 @@ public class TestSaltstackAdapterImpl {
         params.put("User", "test");
         params.put("Password", "test");
         params.put("Test", "success");
-        params.put("retryDelay", "0");
-        params.put("retryCount", "0");
+        params.put("withRetry", "0");
         params.put("Cmd", "test");
         params.put("SlsExec", "false");
         try {
@@ -225,8 +223,7 @@ public class TestSaltstackAdapterImpl {
         params.put("User", "test");
         params.put("Password", "test");
         params.put("Test", "success");
-        params.put("retryDelay", "-1");
-        params.put("retryCount", "-1");
+        params.put("withRetry", "false");
         params.put("Cmd", "test");
         params.put("SlsExec", "false");
 
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 57590bae..b03b0f78 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
@@ -169,24 +169,6 @@ public class TestSaltstackAdapterPropertiesProviderImpl {
         adapter = new SaltstackAdapterImpl(propProvider);
     }
 
-    @Test(expected = SvcLogicException.class)
-    public void reqExecCommand_setPropertiesBOTHPortString() throws SvcLogicException,
-            IllegalStateException, IllegalArgumentException {
-        params.put("org.onap.appc.adapter.saltstack.clientType", "BOTH");
-        params.put("org.onap.appc.adapter.saltstack.host", "test");
-        params.put("org.onap.appc.adapter.saltstack.port", "test");
-        params.put("org.onap.appc.adapter.saltstack.userName", "test");
-        params.put("org.onap.appc.adapter.saltstack.userPasswd", "test");
-        params.put("org.onap.appc.adapter.saltstack.sshKey", "test");
-        SaltstackAdapterPropertiesProvider propProvider = new SaltstackAdapterPropertiesProvider() {
-            @Override
-            public Properties getProperties() {
-                return params;
-            }
-        };
-        adapter = new SaltstackAdapterImpl(propProvider);
-    }
-
     @Test
     public void reqExecCommand_setPropertiesBOTHSuccess() throws SvcLogicException,
             IllegalStateException, IllegalArgumentException {