aboutsummaryrefslogtreecommitdiffstats
path: root/saltstack-adapter/saltstack-directed-graphs-sample
diff options
context:
space:
mode:
authorGanesh Chandrasekaran <ganesh.c@samsung.com>2018-07-18 15:27:52 +0900
committerGanesh Chandrasekaran <ganesh.c@samsung.com>2018-07-19 09:34:59 +0900
commitf8ebec657389d40a88442b5a9be1a18254bbdbfd (patch)
treef5bbf92bd7054771c051f42575db1f7f589b127d /saltstack-adapter/saltstack-directed-graphs-sample
parent43a3f54d5ac9ab15025910a575df9fd4be6237d8 (diff)
saltstack to take env and file param
Issue-ID: CCSDK-383 Change-Id: Id069d77d8f11203a2f604470c116bcf3cc618c2f Signed-off-by: Ganesh Chandrasekaran <ganesh.c@samsung.com>
Diffstat (limited to 'saltstack-adapter/saltstack-directed-graphs-sample')
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.json6
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.xml8
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.json4
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.xml16
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.json4
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.xml32
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.json2
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.xml8
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.json215
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.xml78
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.json373
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.xml169
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.json215
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.xml74
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.json373
-rw-r--r--saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.xml169
16 files changed, 1536 insertions, 210 deletions
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.json
index 3a287e34..562c24ad 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.json
@@ -37,7 +37,7 @@
"id": "d40bf650.8338e8",
"type": "returnFailure",
"name": "return failure",
- "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
"comments": "",
"x": 1007,
"y": 373,
@@ -48,7 +48,7 @@
"id": "38662e01.1d3c22",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='cmd' value='cd /srv/salt; ls -l'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='Cmd' value='cd /srv/salt; ls -l'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
"comments": "",
"outputs": 1,
"x": 700,
@@ -146,7 +146,7 @@
"id": "1f81a3db.54cd1c",
"type": "returnSuccess",
"name": "return success",
- "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>\n",
+ "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.saltstack.results`'/>\n",
"comments": "",
"x": 887,
"y": 460,
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.xml
index eadf3361..e28bbc2a 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exe-nonSLS.xml
@@ -3,16 +3,16 @@
xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
module='APPC' version='2.0.1'>
<method rpc='saltstack-adapter-1.0-exe-nonSLS' mode='sync'>
- <execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter'
+ <execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter'
method='reqExecCommand'>
<parameter name='HostName' value='`$AgentUrl`'/>
<parameter name='Port' value='`$Port`'/>
<parameter name='User' value='`$User`'/>
<parameter name='Password' value='`$Password`'/>
<parameter name='Id' value='test1'/>
- <parameter name='cmd' value='cd /srv/salt; ls -l'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
+ <parameter name='Cmd' value='cd /srv/salt; ls -l'/>
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
<outcome value='failure'>
<return status='failure'>
<parameter name='error-code' value='200'/>
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.json
index 95178ac2..deefddf3 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.json
@@ -48,7 +48,7 @@
"id": "65cc87e2.a95188",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='Cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
"comments": "",
"outputs": 1,
"x": 761,
@@ -209,7 +209,7 @@
"id": "770411a5.18825",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='cmd' value='cd /srv/salt/; salt &apos;minion1&apos; state.apply vim --out=json --static'/>\n <parameter name='slsExec' value='true'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='Cmd' value='cd /srv/salt/; salt &apos;minion1&apos; state.apply vim --out=json --static'/>\n <parameter name='SlsExec' value='true'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
"comments": "",
"outputs": 1,
"x": 773,
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.xml
index c112723c..9861351d 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-SLSFile.xml
@@ -3,17 +3,17 @@
xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
module='APPC' version='2.0.1'>
<method rpc='saltstack-adapter-1.0-exec-SLSFile' mode='sync'>
- <execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter'
+ <execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter'
method='reqExecCommand'>
<parameter name='HostName' value='`$AgentUrl`'/>
<parameter name='Port' value='`$Port`'/>
<parameter name='User' value='`$User`'/>
<parameter name='Password' value='`$Password`'/>
<parameter name='Id' value='test1'/>
- <parameter name='cmd'
+ <parameter name='Cmd'
value='salt &apos;*&apos; test.ping --out=json --static'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
<outcome value='failure'>
<return status='failure'>
<parameter name='error-code' value='200'/>
@@ -47,7 +47,7 @@
</outcome>
<outcome value='true'>
<execute
- plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter'
+ plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter'
method='reqExecCommand'>
<parameter name='HostName'
value='`$AgentUrl`'/>
@@ -56,10 +56,10 @@
<parameter name='Password'
value='`$Password`'/>
<parameter name='Id' value='test2'/>
- <parameter name='cmd'
+ <parameter name='Cmd'
value='cd /srv/salt/; salt &apos;minion1&apos; state.apply vim --out=json --static'/>
- <parameter name='slsExec' value='true'/>
- <parameter name='execTimeout'
+ <parameter name='SlsExec' value='true'/>
+ <parameter name='Timeout'
value='`$Timeout`'/>
<outcome value='failure'>
<return status='failure'>
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.json
index 85254587..1b891a20 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.json
@@ -48,7 +48,7 @@
"id": "c332cb01.51a3e8",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='Cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
"comments": "",
"outputs": 1,
"x": 824,
@@ -209,7 +209,7 @@
"id": "df0c0907.d17838",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='cmd' value='salt &apos;minion1&apos; pkg.install vim --out=json --static'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='Cmd' value='salt &apos;minion1&apos; pkg.install vim --out=json --static'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
"comments": "",
"outputs": 1,
"x": 836,
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.xml
index 0e5e17c4..404ac7ac 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-multi-sls.xml
@@ -3,24 +3,24 @@
xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
module='APPC' version='2.0.1'>
<method rpc='saltstack-adapter-1.0-exec-multi-sls' mode='sync'>
- <execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter'
+ <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
method='reqExecCommand'>
<parameter name='HostName' value='`$AgentUrl`'/>
<parameter name='Port' value='`$Port`'/>
<parameter name='User' value='`$User`'/>
<parameter name='Password' value='`$Password`'/>
<parameter name='Id' value='test1'/>
- <parameter name='cmd'
+ <parameter name='Cmd'
value='salt &apos;*&apos; test.ping --out=json --static'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
<outcome value='failure'>
<return status='failure'>
<parameter name='error-code' value='200'/>
<parameter name='error-message'
- value='`$org.openecomp.appc.adapter.ansible.message`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
<parameter name='output.status.results'
- value='`$org.openecomp.appc.adapter.ansible.results`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
</return>
</outcome>
<outcome value='Other'>
@@ -29,9 +29,9 @@
<return status='failure'>
<parameter name='error-code' value='200'/>
<parameter name='error-message'
- value='`$org.openecomp.appc.adapter.ansible.message`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
<parameter name='output.status.results'
- value='`$org.openecomp.appc.adapter.ansible.results`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
</return>
</outcome>
<outcome value='200'>
@@ -40,14 +40,14 @@
<return status='failure'>
<parameter name='error-code' value='200'/>
<parameter name='error-message'
- value='`$org.openecomp.appc.adapter.ansible.message`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
<parameter name='output.status.results'
- value='`$org.openecomp.appc.adapter.ansible.results`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
</return>
</outcome>
<outcome value='true'>
<execute
- plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter'
+ plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
method='reqExecCommand'>
<parameter name='HostName'
value='`$AgentUrl`'/>
@@ -56,20 +56,20 @@
<parameter name='Password'
value='`$Password`'/>
<parameter name='Id' value='test2'/>
- <parameter name='cmd'
+ <parameter name='Cmd'
value='salt &apos;minion1&apos; pkg.install vim --out=json --static'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout'
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout'
value='`$Timeout`'/>
<outcome value='failure'>
<return status='failure'>
<parameter name='error-code'
value='200'/>
<parameter name='error-message'
- value='`$org.openecomp.appc.adapter.ansible.message`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
<parameter
name='output.status.results'
- value='`$org.openecomp.appc.adapter.ansible.results`'/>
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
</return>
</outcome>
<outcome value='Other'>
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.json
index a8535d00..920e1145 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.json
@@ -48,7 +48,7 @@
"id": "f4e59dd0.ee45f",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='Cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
"comments": "",
"outputs": 1,
"x": 735,
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.xml
index 57620f58..dfc4691d 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adapter-1.0-exec-single-SLSComm.xml
@@ -3,17 +3,17 @@
xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
module='APPC' version='2.0.1'>
<method rpc='saltstack-adapter-1.0-exec-single-SLSComm' mode='sync'>
- <execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter'
+ <execute plugin='org.openecomp.appc.adapter.ansible.SaltstackAdapter'
method='reqExecCommand'>
<parameter name='HostName' value='`$AgentUrl`'/>
<parameter name='Port' value='`$Port`'/>
<parameter name='User' value='`$User`'/>
<parameter name='Password' value='`$Password`'/>
<parameter name='Id' value='test1'/>
- <parameter name='cmd'
+ <parameter name='Cmd'
value='salt &apos;*&apos; test.ping --out=json --static'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
<outcome value='failure'>
<return status='failure'>
<parameter name='error-code' value='200'/>
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.json
index 875c6faa..7fe88f06 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.json
@@ -1 +1,214 @@
-[{"id":"b9234075.7e20b","type":"method","name":"saltstack-adapter-1.0","xml":"<method rpc='saltstack-adapter-1.0' mode='sync'>\n","comments":"","outputs":1,"x":589,"y":221,"z":"8c500c8b.91561","wires":[["a9f084e0.590cc8"]]},{"id":"159aca46.2fdf66","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>","outputs":1,"x":366,"y":220,"z":"8c500c8b.91561","wires":[["b9234075.7e20b"]]},{"id":"f809843e.12d3b8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>\n","comments":"","x":968,"y":313,"z":"8c500c8b.91561","wires":[]},{"id":"cad8db4d.3d8978","type":"dgstart","name":"DGSTART","outputs":1,"x":197,"y":219,"z":"8c500c8b.91561","wires":[["159aca46.2fdf66"]]},{"id":"96da3695.f3ade8","type":"comment","name":"SaltStack Adaptor DG","info":"","comments":"","x":574,"y":98,"z":"8c500c8b.91561","wires":[]},{"id":"f3c2409c.90b75","type":"comment","name":"request-method = reqExecSLS, req-action = \"execute SLS\"","info":"This would be the ideal adaptor the orchestrator DG will call, this just takes in slsName.","comments":"","x":585,"y":183,"z":"8c500c8b.91561","wires":[]},{"id":"206ad453.90dcdc","type":"comment","name":"Assumptions for this DG (example-server)","info":"Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ","comments":"","x":577,"y":139,"z":"8c500c8b.91561","wires":[]},{"id":"a9f084e0.590cc8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='slsName' value='test-file.sls'/>\n","comments":"","outputs":1,"x":279,"y":350,"z":"8c500c8b.91561","wires":[["953d6f9.633bc9","2b0177ad.6a0c88"]]},{"id":"953d6f9.633bc9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":472,"y":311,"z":"8c500c8b.91561","wires":[["56ac40b9.ab7d9"]]},{"id":"2b0177ad.6a0c88","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":470,"y":383,"z":"8c500c8b.91561","wires":[["245f2c0b.5f8894"]]},{"id":"245f2c0b.5f8894","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n","comments":"","outputs":1,"x":622,"y":371,"z":"8c500c8b.91561","wires":[["9cb78c41.7c1fc","a2c5d59b.172848"]]},{"id":"a2c5d59b.172848","type":"success","name":"success","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":785,"y":317,"z":"8c500c8b.91561","wires":[["f809843e.12d3b8"]]},{"id":"9cb78c41.7c1fc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":782,"y":386,"z":"8c500c8b.91561","wires":[["2ca5c925.6ee136"]]},{"id":"56ac40b9.ab7d9","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":632,"y":295,"z":"8c500c8b.91561","wires":[]},{"id":"2ca5c925.6ee136","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":952,"y":383,"z":"8c500c8b.91561","wires":[]}] \ No newline at end of file
+[
+ {
+ "id": "80b83851.e527b8",
+ "type": "method",
+ "name": "saltstack-adapter-1.0",
+ "xml": "<method rpc='saltstack-adapter-1.0' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 676,
+ "y": 277,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "83c8d47e.cb9c98"
+ ]
+ ]
+ },
+ {
+ "id": "41231c44.5d1324",
+ "type": "service-logic",
+ "name": "APPC 2.0.1",
+ "module": "APPC",
+ "version": "2.0.1",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>",
+ "outputs": 1,
+ "x": 453,
+ "y": 276,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "80b83851.e527b8"
+ ]
+ ]
+ },
+ {
+ "id": "1f4a794d.fb3be7",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.saltstack.results`'/>\n",
+ "comments": "",
+ "x": 1055,
+ "y": 369,
+ "z": "1f6661d7.1ebd2e",
+ "wires": []
+ },
+ {
+ "id": "5a85036.5a9e2fc",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 284,
+ "y": 275,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "41231c44.5d1324"
+ ]
+ ]
+ },
+ {
+ "id": "b38fc61c.a23438",
+ "type": "comment",
+ "name": "SaltStack Adaptor DG",
+ "info": "",
+ "comments": "",
+ "x": 661,
+ "y": 154,
+ "z": "1f6661d7.1ebd2e",
+ "wires": []
+ },
+ {
+ "id": "6a821d83.4070e4",
+ "type": "comment",
+ "name": "request-method = reqExecSLS, req-action = \"execute SLS\"",
+ "info": "This would be the ideal adaptor the orchestrator DG will call, this just takes in SlsName.",
+ "comments": "",
+ "x": 672,
+ "y": 239,
+ "z": "1f6661d7.1ebd2e",
+ "wires": []
+ },
+ {
+ "id": "ba16960c.36bad8",
+ "type": "comment",
+ "name": "Assumptions for this DG (example-server)",
+ "info": "Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ",
+ "comments": "",
+ "x": 664,
+ "y": 195,
+ "z": "1f6661d7.1ebd2e",
+ "wires": []
+ },
+ {
+ "id": "83c8d47e.cb9c98",
+ "type": "execute",
+ "name": "execute",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='SlsName' value='test-file.sls'/>\n <parameter name='NodeList' value='`$NodeList`'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n <parameter name='FileParameters' value='`$FileParameters`'/>\n <parameter name='EnvParameters' value='`$EnvParameters`'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 366,
+ "y": 406,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "b83f5a23.33f938",
+ "3354190.eb450e8"
+ ]
+ ]
+ },
+ {
+ "id": "b83f5a23.33f938",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 559,
+ "y": 367,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "efc02e73.0cf1d"
+ ]
+ ]
+ },
+ {
+ "id": "3354190.eb450e8",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 557,
+ "y": 439,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "88b53985.e42758"
+ ]
+ ]
+ },
+ {
+ "id": "88b53985.e42758",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 709,
+ "y": 427,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "195a294e.61efb7",
+ "bc1bfd78.146bc"
+ ]
+ ]
+ },
+ {
+ "id": "bc1bfd78.146bc",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 872,
+ "y": 373,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "1f4a794d.fb3be7"
+ ]
+ ]
+ },
+ {
+ "id": "195a294e.61efb7",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 869,
+ "y": 442,
+ "z": "1f6661d7.1ebd2e",
+ "wires": [
+ [
+ "81ddc2e0.dce24"
+ ]
+ ]
+ },
+ {
+ "id": "efc02e73.0cf1d",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 719,
+ "y": 351,
+ "z": "1f6661d7.1ebd2e",
+ "wires": []
+ },
+ {
+ "id": "81ddc2e0.dce24",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 1039,
+ "y": 439,
+ "z": "1f6661d7.1ebd2e",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.xml
index 8a237f3f..23ec7856 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0 IDEAL.xml
@@ -1,26 +1,52 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'><method rpc='saltstack-adapter-1.0' mode='sync'>
-<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >
- <parameter name='HostName' value='`$AgentUrl`'/>
- <parameter name='Port' value='`$Port`'/>
- <parameter name='User' value='`$User`'/>
- <parameter name='Password' value='`$Password`'/>
- <parameter name='Id' value='test2'/>
- <parameter name='slsName' value='test-file.sls'/>
-<outcome value='failure'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome><outcome value='Other'>
-<switch test="`$org.onap.appc.adapter.saltstack.result.code`">
-<outcome value='200'>
-<return status='success'>
-<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />
-<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>
-<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>
-</return></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome></execute></method></service-logic> \ No newline at end of file
+<service-logic xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
+ module='APPC' version='2.0.1'>
+ <method rpc='saltstack-adapter-1.0' mode='sync'>
+ <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
+ method='reqExecCommand'>
+ <parameter name='HostName' value='`$AgentUrl`'/>
+ <parameter name='Port' value='`$Port`'/>
+ <parameter name='User' value='`$User`'/>
+ <parameter name='Password' value='`$Password`'/>
+ <parameter name='Id' value='test2'/>
+ <parameter name='SlsName' value='test-file.sls'/>
+ <parameter name='NodeList' value='`$NodeList`'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
+ <parameter name='FileParameters' value='`$FileParameters`'/>
+ <parameter name='EnvParameters' value='`$EnvParameters`'/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.saltstack.result.code`">
+ <outcome value='200'>
+ <return status='success'>
+ <parameter name='output.status.code'
+ value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>
+ <parameter name='output.status.message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.json
index f8c6a015..b276f381 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.json
@@ -1 +1,372 @@
-[{"id":"edb39979.b1ccd8","type":"method","name":"saltstack-adapter-1.0","xml":"<method rpc='saltstack-adapter-1.0-exec-SLS-applyTo' mode='sync'>\n","comments":"","outputs":1,"x":476,"y":245,"z":"671ca899.284f68","wires":[["95c9ba42.6e4aa8"]]},{"id":"a16ea11e.f8d1c","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>","outputs":1,"x":267,"y":323,"z":"671ca899.284f68","wires":[["edb39979.b1ccd8"]]},{"id":"1591f92e.029ca7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":1191,"y":315,"z":"671ca899.284f68","wires":[]},{"id":"95c9ba42.6e4aa8","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n","comments":"","outputs":1,"x":684,"y":251,"z":"671ca899.284f68","wires":[["cd0c458a.2430b8","69e531e3.4efc3"]]},{"id":"38b44d70.9c85d2","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n","comments":"","outputs":1,"x":472,"y":405,"z":"671ca899.284f68","wires":[["505df598.069b9c","5d7292e.22ec06c"]]},{"id":"505df598.069b9c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":658,"y":463,"z":"671ca899.284f68","wires":[["1591f92e.029ca7"]]},{"id":"cd0c458a.2430b8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":935,"y":244,"z":"671ca899.284f68","wires":[["1591f92e.029ca7"]]},{"id":"69e531e3.4efc3","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":282,"y":412,"z":"671ca899.284f68","wires":[["38b44d70.9c85d2"]]},{"id":"5d7292e.22ec06c","type":"success","name":"success","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":661,"y":405,"z":"671ca899.284f68","wires":[["c9df0cea.f2361"]]},{"id":"e4f7eb59.0abb58","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>\n","comments":"","x":1079,"y":564,"z":"671ca899.284f68","wires":[]},{"id":"8e586da4.570f1","type":"dgstart","name":"DGSTART","outputs":1,"x":245,"y":223,"z":"671ca899.284f68","wires":[["a16ea11e.f8d1c"]]},{"id":"71387074.137c1","type":"comment","name":"SaltStack Adaptor DG","info":"","comments":"","x":623,"y":110,"z":"671ca899.284f68","wires":[]},{"id":"c5e8c62d.021758","type":"comment","name":"request-method = reqExecSLS, req-action = \"execute SLS\"","info":"Here we basically test if minion1 is active by pinging to it, then respective sls file is executed on to it. \n","comments":"","x":634,"y":195,"z":"671ca899.284f68","wires":[]},{"id":"1805797.a241487","type":"comment","name":"Assumptions for this DG (example-server)","info":"Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ","comments":"","x":626,"y":151,"z":"671ca899.284f68","wires":[]},{"id":"c9df0cea.f2361","type":"switchNode","name":"switch","xml":"<switch test=\"`$test1.minion1`\">\n","comments":"","outputs":1,"x":825,"y":405,"z":"671ca899.284f68","wires":[["d83d6024.2454d","f4d70bbc.f0bc38"]]},{"id":"d83d6024.2454d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":991,"y":459,"z":"671ca899.284f68","wires":[["1591f92e.029ca7"]]},{"id":"f4d70bbc.f0bc38","type":"other","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":994,"y":401,"z":"671ca899.284f68","wires":[["e86d9995.b65c58"]]},{"id":"e86d9995.b65c58","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='slsName' value='test-file.sls'/>\n <parameter name='applyTo' value='minion1'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n","comments":"","outputs":1,"x":398,"y":593,"z":"671ca899.284f68","wires":[["89ff1c2a.08f52","e20c4c85.43d3c"]]},{"id":"89ff1c2a.08f52","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":583,"y":562,"z":"671ca899.284f68","wires":[["6032e33e.5b044c"]]},{"id":"e20c4c85.43d3c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":581,"y":634,"z":"671ca899.284f68","wires":[["8bb4c177.499c8"]]},{"id":"8bb4c177.499c8","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n","comments":"","outputs":1,"x":733,"y":622,"z":"671ca899.284f68","wires":[["905334fe.934d68","9c217c10.9d539"]]},{"id":"9c217c10.9d539","type":"success","name":"success","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":896,"y":568,"z":"671ca899.284f68","wires":[["e4f7eb59.0abb58"]]},{"id":"905334fe.934d68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":893,"y":637,"z":"671ca899.284f68","wires":[["7026a88c.5bffd8"]]},{"id":"6032e33e.5b044c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":735,"y":559,"z":"671ca899.284f68","wires":[]},{"id":"7026a88c.5bffd8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":1054,"y":637,"z":"671ca899.284f68","wires":[]}] \ No newline at end of file
+[
+ {
+ "id": "edb39979.b1ccd8",
+ "type": "method",
+ "name": "saltstack-adapter-1.0",
+ "xml": "<method rpc='saltstack-adapter-1.0-exec-SLS-NodeList' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 476,
+ "y": 245,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "95c9ba42.6e4aa8"
+ ]
+ ]
+ },
+ {
+ "id": "a16ea11e.f8d1c",
+ "type": "service-logic",
+ "name": "APPC 2.0.1",
+ "module": "APPC",
+ "version": "2.0.1",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>",
+ "outputs": 1,
+ "x": 267,
+ "y": 323,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "edb39979.b1ccd8"
+ ]
+ ]
+ },
+ {
+ "id": "1591f92e.029ca7",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 1191,
+ "y": 315,
+ "z": "671ca899.284f68",
+ "wires": []
+ },
+ {
+ "id": "95c9ba42.6e4aa8",
+ "type": "execute",
+ "name": "execute",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='Cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 684,
+ "y": 251,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "cd0c458a.2430b8",
+ "69e531e3.4efc3"
+ ]
+ ]
+ },
+ {
+ "id": "38b44d70.9c85d2",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 472,
+ "y": 405,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "505df598.069b9c",
+ "5d7292e.22ec06c"
+ ]
+ ]
+ },
+ {
+ "id": "505df598.069b9c",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 658,
+ "y": 463,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "1591f92e.029ca7"
+ ]
+ ]
+ },
+ {
+ "id": "cd0c458a.2430b8",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 935,
+ "y": 244,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "1591f92e.029ca7"
+ ]
+ ]
+ },
+ {
+ "id": "69e531e3.4efc3",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 282,
+ "y": 412,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "38b44d70.9c85d2"
+ ]
+ ]
+ },
+ {
+ "id": "5d7292e.22ec06c",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 661,
+ "y": 405,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "c9df0cea.f2361"
+ ]
+ ]
+ },
+ {
+ "id": "e4f7eb59.0abb58",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.saltstack.results`'/>\n",
+ "comments": "",
+ "x": 1079,
+ "y": 564,
+ "z": "671ca899.284f68",
+ "wires": []
+ },
+ {
+ "id": "8e586da4.570f1",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 245,
+ "y": 223,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "a16ea11e.f8d1c"
+ ]
+ ]
+ },
+ {
+ "id": "71387074.137c1",
+ "type": "comment",
+ "name": "SaltStack Adaptor DG",
+ "info": "",
+ "comments": "",
+ "x": 623,
+ "y": 110,
+ "z": "671ca899.284f68",
+ "wires": []
+ },
+ {
+ "id": "c5e8c62d.021758",
+ "type": "comment",
+ "name": "request-method = reqExecSLS, req-action = \"execute SLS\"",
+ "info": "Here we basically test if minion1 is active by pinging to it, then respective sls file is executed on to it. \n",
+ "comments": "",
+ "x": 634,
+ "y": 195,
+ "z": "671ca899.284f68",
+ "wires": []
+ },
+ {
+ "id": "1805797.a241487",
+ "type": "comment",
+ "name": "Assumptions for this DG (example-server)",
+ "info": "Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ",
+ "comments": "",
+ "x": 626,
+ "y": 151,
+ "z": "671ca899.284f68",
+ "wires": []
+ },
+ {
+ "id": "c9df0cea.f2361",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$test1.minion1`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 825,
+ "y": 405,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "d83d6024.2454d",
+ "f4d70bbc.f0bc38"
+ ]
+ ]
+ },
+ {
+ "id": "d83d6024.2454d",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 991,
+ "y": 459,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "1591f92e.029ca7"
+ ]
+ ]
+ },
+ {
+ "id": "f4d70bbc.f0bc38",
+ "type": "other",
+ "name": "outcome",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 994,
+ "y": 401,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "e86d9995.b65c58"
+ ]
+ ]
+ },
+ {
+ "id": "e86d9995.b65c58",
+ "type": "execute",
+ "name": "execute",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='SlsName' value='test-file.sls'/>\n <parameter name='NodeList' value='minion1'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 398,
+ "y": 593,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "89ff1c2a.08f52",
+ "e20c4c85.43d3c"
+ ]
+ ]
+ },
+ {
+ "id": "89ff1c2a.08f52",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 583,
+ "y": 562,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "6032e33e.5b044c"
+ ]
+ ]
+ },
+ {
+ "id": "e20c4c85.43d3c",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 581,
+ "y": 634,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "8bb4c177.499c8"
+ ]
+ ]
+ },
+ {
+ "id": "8bb4c177.499c8",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 733,
+ "y": 622,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "905334fe.934d68",
+ "9c217c10.9d539"
+ ]
+ ]
+ },
+ {
+ "id": "9c217c10.9d539",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 896,
+ "y": 568,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "e4f7eb59.0abb58"
+ ]
+ ]
+ },
+ {
+ "id": "905334fe.934d68",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 893,
+ "y": 637,
+ "z": "671ca899.284f68",
+ "wires": [
+ [
+ "7026a88c.5bffd8"
+ ]
+ ]
+ },
+ {
+ "id": "6032e33e.5b044c",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 735,
+ "y": 559,
+ "z": "671ca899.284f68",
+ "wires": []
+ },
+ {
+ "id": "7026a88c.5bffd8",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 1054,
+ "y": 637,
+ "z": "671ca899.284f68",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.xml
index a8262885..cc4538ca 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLS/APPC_saltstack-adapter-1.0-exec-SLS-applyTo.xml
@@ -1,57 +1,112 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'><method rpc='saltstack-adapter-1.0-exec-SLS-applyTo' mode='sync'>
-<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >
- <parameter name='HostName' value='`$AgentUrl`'/>
- <parameter name='Port' value='`$Port`'/>
- <parameter name='User' value='`$User`'/>
- <parameter name='Password' value='`$Password`'/>
- <parameter name='Id' value='test1'/>
- <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
-<outcome value='failure'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome><outcome value='Other'>
-<switch test="`$org.onap.appc.adapter.saltstack.result.code`">
-<outcome value='200'>
-<switch test="`$test1.minion1`">
-<outcome value='true'>
-<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >
- <parameter name='HostName' value='`$AgentUrl`'/>
- <parameter name='Port' value='`$Port`'/>
- <parameter name='User' value='`$User`'/>
- <parameter name='Password' value='`$Password`'/>
- <parameter name='Id' value='test2'/>
- <parameter name='slsName' value='test-file.sls'/>
- <parameter name='applyTo' value='minion1'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
-<outcome value='failure'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome><outcome value='Other'>
-<switch test="`$org.onap.appc.adapter.saltstack.result.code`">
-<outcome value='200'>
-<return status='success'>
-<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />
-<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>
-<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>
-</return></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome></execute></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome></execute></method></service-logic> \ No newline at end of file
+<service-logic xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
+ module='APPC' version='2.0.1'>
+ <method rpc='saltstack-adapter-1.0-exec-SLS-NodeList' mode='sync'>
+ <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
+ method='reqExecCommand'>
+ <parameter name='HostName' value='`$AgentUrl`'/>
+ <parameter name='Port' value='`$Port`'/>
+ <parameter name='User' value='`$User`'/>
+ <parameter name='Password' value='`$Password`'/>
+ <parameter name='Id' value='test1'/>
+ <parameter name='Cmd'
+ value='salt &apos;*&apos; test.ping --out=json --static'/>
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.saltstack.result.code`">
+ <outcome value='200'>
+ <switch test="`$test1.minion1`">
+ <outcome value='true'>
+ <execute
+ plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
+ method='reqExecCommand'>
+ <parameter name='HostName'
+ value='`$AgentUrl`'/>
+ <parameter name='Port' value='`$Port`'/>
+ <parameter name='User' value='`$User`'/>
+ <parameter name='Password'
+ value='`$Password`'/>
+ <parameter name='Id' value='test2'/>
+ <parameter name='SlsName'
+ value='test-file.sls'/>
+ <parameter name='NodeList' value='minion1'/>
+ <parameter name='Timeout'
+ value='`$Timeout`'/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code'
+ value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter
+ name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.saltstack.result.code`">
+ <outcome value='200'>
+ <return status='success'>
+ <parameter
+ name='output.status.code'
+ value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>
+ <parameter
+ name='output.status.message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter
+ name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code'
+ value='200'/>
+ <parameter
+ name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter
+ name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.json
index a4ec6f1b..b20e7e8d 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.json
@@ -1 +1,214 @@
-[{"id":"3228200a.5dc1a","type":"method","name":"saltstack-adapter-1.0","xml":"<method rpc='saltstack-adapter-1.0-SLSFILE' mode='sync'>\n","comments":"","outputs":1,"x":679,"y":282,"z":"6d4f912d.f07bc","wires":[["50b2729f.712eac"]]},{"id":"9fb54163.4fb28","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>","outputs":1,"x":456,"y":281,"z":"6d4f912d.f07bc","wires":[["3228200a.5dc1a"]]},{"id":"49109fbc.a7a14","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>\n","comments":"","x":1058,"y":374,"z":"6d4f912d.f07bc","wires":[]},{"id":"d030a396.56232","type":"dgstart","name":"DGSTART","outputs":1,"x":287,"y":280,"z":"6d4f912d.f07bc","wires":[["9fb54163.4fb28"]]},{"id":"281900c4.fd3e8","type":"comment","name":"SaltStack Adaptor DG","info":"","comments":"","x":664,"y":159,"z":"6d4f912d.f07bc","wires":[]},{"id":"431a69db.2d2c58","type":"comment","name":"request-method = reqExecSLS, req-action = \"execute SLS\"","info":"This would be the ideal adaptor the orchestrator DG will call, this just takes in slsName.","comments":"","x":675,"y":244,"z":"6d4f912d.f07bc","wires":[]},{"id":"4202e1ce.09495","type":"comment","name":"Assumptions for this DG (example-server)","info":"Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ","comments":"","x":667,"y":200,"z":"6d4f912d.f07bc","wires":[]},{"id":"50b2729f.712eac","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='slsFile' value='file/location/test-file.sls'/>\n","comments":"","outputs":1,"x":369,"y":411,"z":"6d4f912d.f07bc","wires":[["71746570.35f0dc","3e4f7a4a.ae0dc6"]]},{"id":"71746570.35f0dc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":562,"y":372,"z":"6d4f912d.f07bc","wires":[["e59a1a81.112a08"]]},{"id":"3e4f7a4a.ae0dc6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":560,"y":444,"z":"6d4f912d.f07bc","wires":[["59e320fa.12908"]]},{"id":"59e320fa.12908","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n","comments":"","outputs":1,"x":712,"y":432,"z":"6d4f912d.f07bc","wires":[["f81ed07.2135c3","eb55b5a9.f0d2f8"]]},{"id":"eb55b5a9.f0d2f8","type":"success","name":"success","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":875,"y":378,"z":"6d4f912d.f07bc","wires":[["49109fbc.a7a14"]]},{"id":"f81ed07.2135c3","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":872,"y":447,"z":"6d4f912d.f07bc","wires":[["6549631f.8e516c"]]},{"id":"e59a1a81.112a08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":722,"y":356,"z":"6d4f912d.f07bc","wires":[]},{"id":"6549631f.8e516c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":1042,"y":444,"z":"6d4f912d.f07bc","wires":[]}] \ No newline at end of file
+[
+ {
+ "id": "3228200a.5dc1a",
+ "type": "method",
+ "name": "saltstack-adapter-1.0",
+ "xml": "<method rpc='saltstack-adapter-1.0-SLSFILE' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 679,
+ "y": 282,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "50b2729f.712eac"
+ ]
+ ]
+ },
+ {
+ "id": "9fb54163.4fb28",
+ "type": "service-logic",
+ "name": "APPC 2.0.1",
+ "module": "APPC",
+ "version": "2.0.1",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>",
+ "outputs": 1,
+ "x": 456,
+ "y": 281,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "3228200a.5dc1a"
+ ]
+ ]
+ },
+ {
+ "id": "49109fbc.a7a14",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.saltstack.results`'/>\n",
+ "comments": "",
+ "x": 1058,
+ "y": 374,
+ "z": "6d4f912d.f07bc",
+ "wires": []
+ },
+ {
+ "id": "d030a396.56232",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 287,
+ "y": 280,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "9fb54163.4fb28"
+ ]
+ ]
+ },
+ {
+ "id": "281900c4.fd3e8",
+ "type": "comment",
+ "name": "SaltStack Adaptor DG",
+ "info": "",
+ "comments": "",
+ "x": 664,
+ "y": 159,
+ "z": "6d4f912d.f07bc",
+ "wires": []
+ },
+ {
+ "id": "431a69db.2d2c58",
+ "type": "comment",
+ "name": "request-method = reqExecSLS, req-action = \"execute SLS\"",
+ "info": "This would be the ideal adaptor the orchestrator DG will call, this just takes in SlsName.",
+ "comments": "",
+ "x": 675,
+ "y": 244,
+ "z": "6d4f912d.f07bc",
+ "wires": []
+ },
+ {
+ "id": "4202e1ce.09495",
+ "type": "comment",
+ "name": "Assumptions for this DG (example-server)",
+ "info": "Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ",
+ "comments": "",
+ "x": 667,
+ "y": 200,
+ "z": "6d4f912d.f07bc",
+ "wires": []
+ },
+ {
+ "id": "50b2729f.712eac",
+ "type": "execute",
+ "name": "execute",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='SlsFile' value='file/location/test-file.sls'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 369,
+ "y": 411,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "71746570.35f0dc",
+ "3e4f7a4a.ae0dc6"
+ ]
+ ]
+ },
+ {
+ "id": "71746570.35f0dc",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 562,
+ "y": 372,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "e59a1a81.112a08"
+ ]
+ ]
+ },
+ {
+ "id": "3e4f7a4a.ae0dc6",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 560,
+ "y": 444,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "59e320fa.12908"
+ ]
+ ]
+ },
+ {
+ "id": "59e320fa.12908",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 712,
+ "y": 432,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "f81ed07.2135c3",
+ "eb55b5a9.f0d2f8"
+ ]
+ ]
+ },
+ {
+ "id": "eb55b5a9.f0d2f8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 875,
+ "y": 378,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "49109fbc.a7a14"
+ ]
+ ]
+ },
+ {
+ "id": "f81ed07.2135c3",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 872,
+ "y": 447,
+ "z": "6d4f912d.f07bc",
+ "wires": [
+ [
+ "6549631f.8e516c"
+ ]
+ ]
+ },
+ {
+ "id": "e59a1a81.112a08",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 722,
+ "y": 356,
+ "z": "6d4f912d.f07bc",
+ "wires": []
+ },
+ {
+ "id": "6549631f.8e516c",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 1042,
+ "y": 444,
+ "z": "6d4f912d.f07bc",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.xml
index bd3325b3..2c5e600f 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-SLSFILE.xml
@@ -1,26 +1,48 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'><method rpc='saltstack-adapter-1.0-SLSFILE' mode='sync'>
-<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >
- <parameter name='HostName' value='`$AgentUrl`'/>
- <parameter name='Port' value='`$Port`'/>
- <parameter name='User' value='`$User`'/>
- <parameter name='Password' value='`$Password`'/>
- <parameter name='Id' value='test2'/>
- <parameter name='slsFile' value='file/location/test-file.sls'/>
-<outcome value='failure'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome><outcome value='Other'>
-<switch test="`$org.onap.appc.adapter.saltstack.result.code`">
-<outcome value='200'>
-<return status='success'>
-<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />
-<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>
-<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>
-</return></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome></execute></method></service-logic> \ No newline at end of file
+<service-logic xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
+ module='APPC' version='2.0.1'>
+ <method rpc='saltstack-adapter-1.0-SLSFILE' mode='sync'>
+ <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
+ method='reqExecCommand'>
+ <parameter name='HostName' value='`$AgentUrl`'/>
+ <parameter name='Port' value='`$Port`'/>
+ <parameter name='User' value='`$User`'/>
+ <parameter name='Password' value='`$Password`'/>
+ <parameter name='Id' value='test2'/>
+ <parameter name='SlsFile' value='file/location/test-file.sls'/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.saltstack.result.code`">
+ <outcome value='200'>
+ <return status='success'>
+ <parameter name='output.status.code'
+ value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>
+ <parameter name='output.status.message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.json b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.json
index de4f0fbb..264950d5 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.json
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.json
@@ -1 +1,372 @@
-[{"id":"9a6bf94f.d969f8","type":"method","name":"saltstack-adapter-1.0","xml":"<method rpc='saltstack-adapter-1.0-exec-SLSFile-applyTo' mode='sync'>\n","comments":"","outputs":1,"x":498,"y":240,"z":"723548c7.652d78","wires":[["138ad7ed.403248"]]},{"id":"4bb87049.3f546","type":"service-logic","name":"APPC 2.0.1","module":"APPC","version":"2.0.1","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>","outputs":1,"x":289,"y":318,"z":"723548c7.652d78","wires":[["9a6bf94f.d969f8"]]},{"id":"6c593992.106038","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":1202,"y":280,"z":"723548c7.652d78","wires":[]},{"id":"138ad7ed.403248","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='slsExec' value='false'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n","comments":"","outputs":1,"x":706,"y":246,"z":"723548c7.652d78","wires":[["167273ed.f0577c","954a34ea.701368"]]},{"id":"d5841e65.537ba","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n","comments":"","outputs":1,"x":494,"y":400,"z":"723548c7.652d78","wires":[["ede42371.2f52b","d306d7a0.c830e8"]]},{"id":"ede42371.2f52b","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":680,"y":458,"z":"723548c7.652d78","wires":[["6c593992.106038"]]},{"id":"167273ed.f0577c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":957,"y":239,"z":"723548c7.652d78","wires":[["6c593992.106038"]]},{"id":"954a34ea.701368","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":304,"y":407,"z":"723548c7.652d78","wires":[["d5841e65.537ba"]]},{"id":"d306d7a0.c830e8","type":"success","name":"success","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":683,"y":400,"z":"723548c7.652d78","wires":[["5b12ba31.94b3b4"]]},{"id":"9ef7fcc3.69279","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>\n","comments":"","x":1101,"y":559,"z":"723548c7.652d78","wires":[]},{"id":"7803eeaf.1e31d","type":"dgstart","name":"DGSTART","outputs":1,"x":267,"y":218,"z":"723548c7.652d78","wires":[["4bb87049.3f546"]]},{"id":"9c6f1e7c.2a3d9","type":"comment","name":"SaltStack Adaptor DG","info":"","comments":"","x":645,"y":105,"z":"723548c7.652d78","wires":[]},{"id":"93ea02a5.4e792","type":"comment","name":"request-method = reqExecSLS, req-action = \"execute SLS FILE\"","info":"Here we basically test if minion1 is active by pinging to it, then respective sls file is executed on to it. \n","comments":"","x":656,"y":190,"z":"723548c7.652d78","wires":[]},{"id":"243edbf.f35fc24","type":"comment","name":"Assumptions for this DG (example-server)","info":"Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ","comments":"","x":648,"y":146,"z":"723548c7.652d78","wires":[]},{"id":"5b12ba31.94b3b4","type":"switchNode","name":"switch","xml":"<switch test=\"`$test1.minion1`\">\n","comments":"","outputs":1,"x":847,"y":400,"z":"723548c7.652d78","wires":[["9bf0915.96f217","f6e533d.95d99d"]]},{"id":"9bf0915.96f217","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1013,"y":454,"z":"723548c7.652d78","wires":[["6c593992.106038"]]},{"id":"f6e533d.95d99d","type":"other","name":"outcome","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1016,"y":396,"z":"723548c7.652d78","wires":[["eb57ba41.1d7328"]]},{"id":"eb57ba41.1d7328","type":"execute","name":"execute","xml":"<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='slsFile' value='file/location/test.sls'/>\n <parameter name='applyTo' value='minion1'/>\n <parameter name='execTimeout' value='`$Timeout`'/>\n","comments":"","outputs":1,"x":420,"y":588,"z":"723548c7.652d78","wires":[["892a8f1d.7d77f","74be8a6e.975f24"]]},{"id":"892a8f1d.7d77f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":605,"y":557,"z":"723548c7.652d78","wires":[["8c091fe.c6cbfe"]]},{"id":"74be8a6e.975f24","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":603,"y":629,"z":"723548c7.652d78","wires":[["3875d695.fd37ca"]]},{"id":"3875d695.fd37ca","type":"switchNode","name":"switch","xml":"<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n","comments":"","outputs":1,"x":755,"y":617,"z":"723548c7.652d78","wires":[["2e60af80.ea3a6","24ed6dd2.6624c2"]]},{"id":"24ed6dd2.6624c2","type":"success","name":"success","xml":"<outcome value='200'>\n","comments":"","outputs":1,"x":918,"y":563,"z":"723548c7.652d78","wires":[["9ef7fcc3.69279"]]},{"id":"2e60af80.ea3a6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":915,"y":632,"z":"723548c7.652d78","wires":[["2e4414a7.ba6d4c"]]},{"id":"8c091fe.c6cbfe","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":757,"y":554,"z":"723548c7.652d78","wires":[]},{"id":"2e4414a7.ba6d4c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />\n","comments":"","x":1076,"y":632,"z":"723548c7.652d78","wires":[]}] \ No newline at end of file
+[
+ {
+ "id": "9a6bf94f.d969f8",
+ "type": "method",
+ "name": "saltstack-adapter-1.0",
+ "xml": "<method rpc='saltstack-adapter-1.0-exec-SLSFile-SlsName' mode='sync'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 498,
+ "y": 240,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "138ad7ed.403248"
+ ]
+ ]
+ },
+ {
+ "id": "4bb87049.3f546",
+ "type": "service-logic",
+ "name": "APPC 2.0.1",
+ "module": "APPC",
+ "version": "2.0.1",
+ "comments": "",
+ "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'>",
+ "outputs": 1,
+ "x": 289,
+ "y": 318,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "9a6bf94f.d969f8"
+ ]
+ ]
+ },
+ {
+ "id": "6c593992.106038",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 1202,
+ "y": 280,
+ "z": "723548c7.652d78",
+ "wires": []
+ },
+ {
+ "id": "138ad7ed.403248",
+ "type": "execute",
+ "name": "execute",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test1'/>\n <parameter name='Cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>\n <parameter name='SlsExec' value='false'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 706,
+ "y": 246,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "167273ed.f0577c",
+ "954a34ea.701368"
+ ]
+ ]
+ },
+ {
+ "id": "d5841e65.537ba",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 494,
+ "y": 400,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "ede42371.2f52b",
+ "d306d7a0.c830e8"
+ ]
+ ]
+ },
+ {
+ "id": "ede42371.2f52b",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 680,
+ "y": 458,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "6c593992.106038"
+ ]
+ ]
+ },
+ {
+ "id": "167273ed.f0577c",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 957,
+ "y": 239,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "6c593992.106038"
+ ]
+ ]
+ },
+ {
+ "id": "954a34ea.701368",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 304,
+ "y": 407,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "d5841e65.537ba"
+ ]
+ ]
+ },
+ {
+ "id": "d306d7a0.c830e8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 683,
+ "y": 400,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "5b12ba31.94b3b4"
+ ]
+ ]
+ },
+ {
+ "id": "9ef7fcc3.69279",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.saltstack.results`'/>\n",
+ "comments": "",
+ "x": 1101,
+ "y": 559,
+ "z": "723548c7.652d78",
+ "wires": []
+ },
+ {
+ "id": "7803eeaf.1e31d",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 267,
+ "y": 218,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "4bb87049.3f546"
+ ]
+ ]
+ },
+ {
+ "id": "9c6f1e7c.2a3d9",
+ "type": "comment",
+ "name": "SaltStack Adaptor DG",
+ "info": "",
+ "comments": "",
+ "x": 645,
+ "y": 105,
+ "z": "723548c7.652d78",
+ "wires": []
+ },
+ {
+ "id": "93ea02a5.4e792",
+ "type": "comment",
+ "name": "request-method = reqExecSLS, req-action = \"execute SLS FILE\"",
+ "info": "Here we basically test if minion1 is active by pinging to it, then respective sls file is executed on to it. \n",
+ "comments": "",
+ "x": 656,
+ "y": 190,
+ "z": "723548c7.652d78",
+ "wires": []
+ },
+ {
+ "id": "243edbf.f35fc24",
+ "type": "comment",
+ "name": "Assumptions for this DG (example-server)",
+ "info": "Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controllers minion1 and minion2. ",
+ "comments": "",
+ "x": 648,
+ "y": 146,
+ "z": "723548c7.652d78",
+ "wires": []
+ },
+ {
+ "id": "5b12ba31.94b3b4",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$test1.minion1`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 847,
+ "y": 400,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "9bf0915.96f217",
+ "f6e533d.95d99d"
+ ]
+ ]
+ },
+ {
+ "id": "9bf0915.96f217",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1013,
+ "y": 454,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "6c593992.106038"
+ ]
+ ]
+ },
+ {
+ "id": "f6e533d.95d99d",
+ "type": "other",
+ "name": "outcome",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1016,
+ "y": 396,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "eb57ba41.1d7328"
+ ]
+ ]
+ },
+ {
+ "id": "eb57ba41.1d7328",
+ "type": "execute",
+ "name": "execute",
+ "xml": "<execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter' method='reqExecCommand' >\n <parameter name='HostName' value='`$AgentUrl`'/>\n <parameter name='Port' value='`$Port`'/>\n <parameter name='User' value='`$User`'/>\n <parameter name='Password' value='`$Password`'/>\n <parameter name='Id' value='test2'/>\n <parameter name='SlsFile' value='file/location/test.sls'/>\n <parameter name='NodeList' value='minion1'/>\n <parameter name='Timeout' value='`$Timeout`'/>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 420,
+ "y": 588,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "892a8f1d.7d77f",
+ "74be8a6e.975f24"
+ ]
+ ]
+ },
+ {
+ "id": "892a8f1d.7d77f",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 605,
+ "y": 557,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "8c091fe.c6cbfe"
+ ]
+ ]
+ },
+ {
+ "id": "74be8a6e.975f24",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 603,
+ "y": 629,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "3875d695.fd37ca"
+ ]
+ ]
+ },
+ {
+ "id": "3875d695.fd37ca",
+ "type": "switchNode",
+ "name": "switch",
+ "xml": "<switch test=\"`$org.onap.appc.adapter.saltstack.result.code`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 755,
+ "y": 617,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "2e60af80.ea3a6",
+ "24ed6dd2.6624c2"
+ ]
+ ]
+ },
+ {
+ "id": "24ed6dd2.6624c2",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='200'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 918,
+ "y": 563,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "9ef7fcc3.69279"
+ ]
+ ]
+ },
+ {
+ "id": "2e60af80.ea3a6",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 915,
+ "y": 632,
+ "z": "723548c7.652d78",
+ "wires": [
+ [
+ "2e4414a7.ba6d4c"
+ ]
+ ]
+ },
+ {
+ "id": "8c091fe.c6cbfe",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 757,
+ "y": 554,
+ "z": "723548c7.652d78",
+ "wires": []
+ },
+ {
+ "id": "2e4414a7.ba6d4c",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adapter.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.saltstack.results`' />\n",
+ "comments": "",
+ "x": 1076,
+ "y": 632,
+ "z": "723548c7.652d78",
+ "wires": []
+ }
+] \ No newline at end of file
diff --git a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.xml b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.xml
index 314cd345..16c573ad 100644
--- a/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.xml
+++ b/saltstack-adapter/saltstack-directed-graphs-sample/reqExecSLSFile/APPC_saltstack-adapter-1.0-exec-SLSFile-applyTo.xml
@@ -1,57 +1,112 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.1'><method rpc='saltstack-adapter-1.0-exec-SLSFile-applyTo' mode='sync'>
-<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >
- <parameter name='HostName' value='`$AgentUrl`'/>
- <parameter name='Port' value='`$Port`'/>
- <parameter name='User' value='`$User`'/>
- <parameter name='Password' value='`$Password`'/>
- <parameter name='Id' value='test1'/>
- <parameter name='cmd' value='salt &apos;*&apos; test.ping --out=json --static'/>
- <parameter name='slsExec' value='false'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
-<outcome value='failure'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome><outcome value='Other'>
-<switch test="`$org.onap.appc.adapter.saltstack.result.code`">
-<outcome value='200'>
-<switch test="`$test1.minion1`">
-<outcome value='true'>
-<execute plugin='org.openecomp.appc.adapter.ansible.AnsibleAdapter' method='reqExecCommand' >
- <parameter name='HostName' value='`$AgentUrl`'/>
- <parameter name='Port' value='`$Port`'/>
- <parameter name='User' value='`$User`'/>
- <parameter name='Password' value='`$Password`'/>
- <parameter name='Id' value='test2'/>
- <parameter name='slsFile' value='file/location/test.sls'/>
- <parameter name='applyTo' value='minion1'/>
- <parameter name='execTimeout' value='`$Timeout`'/>
-<outcome value='failure'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome><outcome value='Other'>
-<switch test="`$org.onap.appc.adapter.saltstack.result.code`">
-<outcome value='200'>
-<return status='success'>
-<parameter name='output.status.code' value='`$org.openecomp.appc.adapter.ansible.result.code`' />
-<parameter name='output.status.message' value='`$org.openecomp.appc.adapter.ansible.message`'/>
-<parameter name='output.status.results' value = '`$org.openecomp.appc.adapter.ansible.results`'/>
-</return></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome></execute></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome><outcome value='Other'>
-<return status='failure'>
-<parameter name='error-code' value='200' />
-<parameter name='error-message' value='`$org.openecomp.appc.adapter.ansible.message`' />
-<parameter name='output.status.results' value='`$org.openecomp.appc.adapter.ansible.results`' />
-</return></outcome></switch></outcome></execute></method></service-logic> \ No newline at end of file
+<service-logic xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd'
+ module='APPC' version='2.0.1'>
+ <method rpc='saltstack-adapter-1.0-exec-SLSFile-NodeList' mode='sync'>
+ <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
+ method='reqExecCommand'>
+ <parameter name='HostName' value='`$AgentUrl`'/>
+ <parameter name='Port' value='`$Port`'/>
+ <parameter name='User' value='`$User`'/>
+ <parameter name='Password' value='`$Password`'/>
+ <parameter name='Id' value='test1'/>
+ <parameter name='Cmd'
+ value='salt &apos;*&apos; test.ping --out=json --static'/>
+ <parameter name='SlsExec' value='false'/>
+ <parameter name='Timeout' value='`$Timeout`'/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.saltstack.result.code`">
+ <outcome value='200'>
+ <switch test="`$test1.minion1`">
+ <outcome value='true'>
+ <execute
+ plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'
+ method='reqExecCommand'>
+ <parameter name='HostName'
+ value='`$AgentUrl`'/>
+ <parameter name='Port' value='`$Port`'/>
+ <parameter name='User' value='`$User`'/>
+ <parameter name='Password'
+ value='`$Password`'/>
+ <parameter name='Id' value='test2'/>
+ <parameter name='SlsFile'
+ value='file/location/test.sls'/>
+ <parameter name='NodeList' value='minion1'/>
+ <parameter name='Timeout'
+ value='`$Timeout`'/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code'
+ value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter
+ name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <switch test="`$org.onap.appc.adapter.saltstack.result.code`">
+ <outcome value='200'>
+ <return status='success'>
+ <parameter
+ name='output.status.code'
+ value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>
+ <parameter
+ name='output.status.message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter
+ name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code'
+ value='200'/>
+ <parameter
+ name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter
+ name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='error-code' value='200'/>
+ <parameter name='error-message'
+ value='`$org.openecomp.appc.adapter.saltstack.message`'/>
+ <parameter name='output.status.results'
+ value='`$org.openecomp.appc.adapter.saltstack.results`'/>
+ </return>
+ </outcome>
+ </switch>
+ </outcome>
+ </execute>
+ </method>
+</service-logic> \ No newline at end of file