saltstack to take env and file param

Issue-ID: CCSDK-383

Change-Id: Id069d77d8f11203a2f604470c116bcf3cc618c2f
Signed-off-by: Ganesh Chandrasekaran <ganesh.c@samsung.com>

4 files changed, 750 insertions, 85 deletions

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