summaryrefslogtreecommitdiffstats
path: root/saltstack-adapter/saltstack-adapter-provider/src/main
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-07-03 11:39:42 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-03 11:39:42 +0000
commitccf87e9fe98de4be6d63f81aaa2b9034da27d039 (patch)
tree10575b517a5ccad96ac74aea0a9a03a366f0d2e6 /saltstack-adapter/saltstack-adapter-provider/src/main
parenta151d4253768a74fc629ca22a7e06b33282a210d (diff)
parentbd3e8cf528e8245dbad8de3b0441de6673484909 (diff)
Merge "Test cases added for saltstack API"
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-provider/src/main')
-rw-r--r--saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackServerEmulator.java2
-rwxr-xr-xsaltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml (renamed from saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml)0
-rw-r--r--saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties (renamed from saltstack-adapter/saltstack-adapter-provider/src/main/resources/ansible-adapter.properties)0
3 files changed, 1 insertions, 1 deletions
diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackServerEmulator.java b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackServerEmulator.java
index d3247525..a9bf7e7c 100644
--- a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackServerEmulator.java
+++ b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/model/SaltstackServerEmulator.java
@@ -83,7 +83,7 @@ public class SaltstackServerEmulator {
/**
* Method to emulate response from an Saltstack
* Server when presented with a GET request
- * Returns an ansibl object result. The response code is always the ssh code 200 (i.e connection successful)
+ * Returns an saltstack object result. The response code is always the ssh code 200 (i.e connection successful)
* payload is json string as would be sent back by Saltstack Server
*
**/
diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml
index df5c46d3..df5c46d3 100755
--- a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/org/opendaylight/blueprint/saltstack-adapter-blueprint.xml
diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/ansible-adapter.properties b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties
index ccaea20c..ccaea20c 100644
--- a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/ansible-adapter.properties
+++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/saltstack-adapter.properties