Saltstack port not mandatory

Issue-ID: CCSDK-390

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

7 files changed, 49 insertions, 49 deletions

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 e28bbc2a..6fbbe5b1 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,7 +3,7 @@
                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.SaltstackAdapter'

+        <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'

                  method='reqExecCommand'>

             <parameter name='HostName' value='`$AgentUrl`'/>

             <parameter name='Port' value='`$Port`'/>

@@ -17,9 +17,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='Other'>

@@ -28,19 +28,19 @@
                         <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'>

                         <return status='success'>

                             <parameter name='output.status.code'

-                                       value='`$org.openecomp.appc.adapter.ansible.result.code`'/>

+                                       value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>

                             <parameter name='output.status.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>

                 </switch>

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 deefddf3..7f427674 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
@@ -37,7 +37,7 @@
     "id": "31587001.4259e",
     "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": 1262,
     "y": 365,
@@ -48,7 +48,7 @@
     "id": "65cc87e2.a95188",
     "type": "execute",
     "name": "execute",
-    "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",
+    "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": 761,
@@ -146,7 +146,7 @@
     "id": "2856792.c401a86",
     "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": 1042,
     "y": 656,
@@ -209,7 +209,7 @@
     "id": "770411a5.18825",
     "type": "execute",
     "name": "execute",
-    "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",
+    "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='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 9861351d..fc63bbd7 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,7 +3,7 @@
                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.SaltstackAdapter'

+        <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'

                  method='reqExecCommand'>

             <parameter name='HostName' value='`$AgentUrl`'/>

             <parameter name='Port' value='`$Port`'/>

@@ -18,9 +18,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='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.SaltstackAdapter'

+                                        plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'

                                         method='reqExecCommand'>

                                     <parameter name='HostName'

                                                value='`$AgentUrl`'/>

@@ -66,10 +66,10 @@
                                             <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'>

@@ -78,13 +78,13 @@
                                                 <return status='success'>

                                                     <parameter

                                                             name='output.status.code'

-                                                            value='`$org.openecomp.appc.adapter.ansible.result.code`'/>

+                                                            value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>

                                                     <parameter

                                                             name='output.status.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'>

@@ -93,10 +93,10 @@
                                                                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>

                                         </switch>

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 1b891a20..d7cfef01 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
@@ -37,7 +37,7 @@
     "id": "40ce8a6.5f7d174",
     "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": 1325,
     "y": 455,
@@ -48,7 +48,7 @@
     "id": "c332cb01.51a3e8",
     "type": "execute",
     "name": "execute",
-    "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",
+    "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": 824,
@@ -146,7 +146,7 @@
     "id": "e45accfe.91615",
     "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": 1345,
     "y": 757,
@@ -209,7 +209,7 @@
     "id": "df0c0907.d17838",
     "type": "execute",
     "name": "execute",
-    "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",
+    "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='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 404ac7ac..cc36b1ca 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
@@ -80,13 +80,13 @@
                                                         <return status='success'>

                                                             <parameter

                                                                     name='output.status.code'

-                                                                    value='`$org.openecomp.appc.adapter.ansible.result.code`'/>

+                                                                    value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>

                                                             <parameter

                                                                     name='output.status.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'>

@@ -96,10 +96,10 @@
                                                                     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>

                                                 </switch>

@@ -110,10 +110,10 @@
                                                                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>

                                         </switch>

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 920e1145..4be0db3d 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
@@ -37,7 +37,7 @@
     "id": "55a7736.2789e8c",
     "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": 1064,
     "y": 453,
@@ -48,7 +48,7 @@
     "id": "f4e59dd0.ee45f",
     "type": "execute",
     "name": "execute",
-    "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",
+    "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": 735,
@@ -146,7 +146,7 @@
     "id": "ce510062.8dcc7",
     "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": 893,
     "y": 399,
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 dfc4691d..bd9aea77 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,7 +3,7 @@
                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.SaltstackAdapter'

+        <execute plugin='org.openecomp.appc.adapter.saltstack.SaltstackAdapter'

                  method='reqExecCommand'>

             <parameter name='HostName' value='`$AgentUrl`'/>

             <parameter name='Port' value='`$Port`'/>

@@ -18,9 +18,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='Other'>

@@ -28,20 +28,20 @@
                     <outcome value='200'>

                         <return status='success'>

                             <parameter name='output.status.code'

-                                       value='`$org.openecomp.appc.adapter.ansible.result.code`'/>

+                                       value='`$org.openecomp.appc.adapter.saltstack.result.code`'/>

                             <parameter name='output.status.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'>

                         <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>

                 </switch>