update on non-sls-DG for appc integration

Signed-off-by: Ganesh <ganesh.c@samsung.com>
Change-Id: I1f20ef35cce41c0d802055c19ce85a0fe638e170
Issue-ID: CCSDK-3499

diff --git a/adaptors/saltstack-adaptor/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adaptor-1.0-exe-nonSLS.json b/adaptors/saltstack-adaptor/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adaptor-1.0-exe-nonSLS.json
index c83b89d..2ce3909 100644 (file)
--- a/adaptors/saltstack-adaptor/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adaptor-1.0-exe-nonSLS.json
+++ b/adaptors/saltstack-adaptor/saltstack-directed-graphs-sample/reqExecCommand/APPC_saltstack-adaptor-1.0-exe-nonSLS.json
@@ -1,203 +1,203 @@
-[
-  {
-    "id": "d86e7ee4.ee3f1",
-    "type": "method",
-    "name": "saltstack-adaptor-1.0",
-    "xml": "<method rpc='saltstack-adaptor-1.0-exe-nonSLS' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 492,
-    "y": 216,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "38662e01.1d3c22"
-      ]
-    ]
-  },
-  {
-    "id": "9997883e.ec9028",
-    "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": 283,
-    "y": 289,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "d86e7ee4.ee3f1"
-      ]
-    ]
-  },
-  {
-    "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.adaptor.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adaptor.saltstack.results`' />\n",
-    "comments": "",
-    "x": 1007,
-    "y": 373,
-    "z": "5945fc3c.78efc4",
-    "wires": []
-  },
-  {
-    "id": "38662e01.1d3c22",
-    "type": "execute",
-    "name": "execute",
-    "xml": "<execute plugin='org.openecomp.appc.adaptor.saltstack.SaltstackAdaptor' 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,
-    "y": 212,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "7b75e382.6344dc",
-        "6f108926.d7baf8"
-      ]
-    ]
-  },
-  {
-    "id": "24fb9f79.a6c6c",
-    "type": "switchNode",
-    "name": "switch",
-    "xml": "<switch test=\"`$org.onap.appc.adaptor.saltstack.result.code`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 486,
-    "y": 372,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "c526c44.c850738",
-        "9c394980.2a56a8"
-      ]
-    ]
-  },
-  {
-    "id": "c526c44.c850738",
-    "type": "other",
-    "name": "outcome",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 675,
-    "y": 371,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "d40bf650.8338e8"
-      ]
-    ]
-  },
-  {
-    "id": "7b75e382.6344dc",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 951,
-    "y": 210,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "d40bf650.8338e8"
-      ]
-    ]
-  },
-  {
-    "id": "6f108926.d7baf8",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 298,
-    "y": 378,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "24fb9f79.a6c6c"
-      ]
-    ]
-  },
-  {
-    "id": "9c394980.2a56a8",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='200'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 667,
-    "y": 460,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "1f81a3db.54cd1c"
-      ]
-    ]
-  },
-  {
-    "id": "1f81a3db.54cd1c",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adaptor.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adaptor.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adaptor.saltstack.results`'/>\n",
-    "comments": "",
-    "x": 887,
-    "y": 460,
-    "z": "5945fc3c.78efc4",
-    "wires": []
-  },
-  {
-    "id": "fcad80f8.ba2d9",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 261,
-    "y": 189,
-    "z": "5945fc3c.78efc4",
-    "wires": [
-      [
-        "9997883e.ec9028"
-      ]
-    ]
-  },
-  {
-    "id": "b86e624d.49f0f",
-    "type": "comment",
-    "name": "SaltStack Adaptor DG",
-    "info": "",
-    "comments": "",
-    "x": 630,
-    "y": 75,
-    "z": "5945fc3c.78efc4",
-    "wires": []
-  },
-  {
-    "id": "83c0578d.061f98",
-    "type": "comment",
-    "name": "request-method = reqExecCommand, req-action = \"execute a single non SLS command\"",
-    "info": "",
-    "comments": "",
-    "x": 650,
-    "y": 155,
-    "z": "5945fc3c.78efc4",
-    "wires": []
-  },
-  {
-    "id": "f104feb6.558f7",
-    "type": "comment",
-    "name": "Assumptions for this DG",
-    "info": "Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controlls minion1 and minion2. ",
-    "comments": "",
-    "x": 627,
-    "y": 115,
-    "z": "5945fc3c.78efc4",
-    "wires": []
-  }
+[\r
+       {\r
+               "id": "32c92369.4418fc",\r
+               "type": "method",\r
+               "name": "saltstack-adaptor-1.0",\r
+               "xml": "<method rpc='saltstack-adaptor-1.0-exe-nonSLS' mode='sync'>\n",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 358,\r
+               "y": 7088.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "b796dcc8.645f7"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "5d7193ca.62154c",\r
+               "type": "service-logic",\r
+               "name": "APPC 2.0.1",\r
+               "module": "APPC",\r
+               "version": "2.0.1",\r
+               "comments": "",\r
+               "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'>",\r
+               "outputs": 1,\r
+               "x": 149,\r
+               "y": 7161.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "32c92369.4418fc"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "8eeaddc3.15ca7",\r
+               "type": "returnFailure",\r
+               "name": "return failure",\r
+               "xml": "<return status='failure'>\n<parameter name='error-code' value='200' />\n<parameter name='error-message' value='`$org.openecomp.appc.adaptor.saltstack.message`' />\n<parameter name='output.status.results' value='`$org.openecomp.appc.adaptor.saltstack.results`' />\n",\r
+               "comments": "",\r
+               "x": 873,\r
+               "y": 7245.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": []\r
+       },\r
+       {\r
+               "id": "b796dcc8.645f7",\r
+               "type": "execute",\r
+               "name": "execute",\r
+               "xml": "<execute plugin='org.openecomp.appc.adaptor.saltstack.SaltstackAdaptor' 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",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 566,\r
+               "y": 7084.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "ad998758.0ecc58",\r
+                               "976845db.fea8d8"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "d17d41d0.313b5",\r
+               "type": "switchNode",\r
+               "name": "switch",\r
+               "xml": "<switch test=\"`$org.onap.appc.adaptor.saltstack.result.code`\">\n",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 352,\r
+               "y": 7244.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "d73af763.cb7778",\r
+                               "9f96d94b.2e7658"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "d73af763.cb7778",\r
+               "type": "other",\r
+               "name": "outcome",\r
+               "xml": "<outcome value='Other'>\n",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 541,\r
+               "y": 7243.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "8eeaddc3.15ca7"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "ad998758.0ecc58",\r
+               "type": "failure",\r
+               "name": "failure",\r
+               "xml": "<outcome value='failure'>\n",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 817,\r
+               "y": 7082.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "8eeaddc3.15ca7"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "976845db.fea8d8",\r
+               "type": "other",\r
+               "name": "other",\r
+               "xml": "<outcome value='Other'>\n",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 164,\r
+               "y": 7250.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "d17d41d0.313b5"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "9f96d94b.2e7658",\r
+               "type": "success",\r
+               "name": "success",\r
+               "xml": "<outcome value='200'>\n",\r
+               "comments": "",\r
+               "outputs": 1,\r
+               "x": 533,\r
+               "y": 7332.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "c1dfbf92.806ef"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "c1dfbf92.806ef",\r
+               "type": "returnSuccess",\r
+               "name": "return success",\r
+               "xml": "<return status='success'>\n<parameter name='output.status.code' value='`$org.openecomp.appc.adaptor.saltstack.result.code`' />\n<parameter name='output.status.message' value='`$org.openecomp.appc.adaptor.saltstack.message`'/>\n<parameter name='output.status.results' value = '`$org.openecomp.appc.adaptor.saltstack.results`'/>\n",\r
+               "comments": "",\r
+               "x": 753,\r
+               "y": 7332.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": []\r
+       },\r
+       {\r
+               "id": "2a9aacea.7d2f94",\r
+               "type": "dgstart",\r
+               "name": "DGSTART",\r
+               "outputs": 1,\r
+               "x": 127,\r
+               "y": 7061.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": [\r
+                       [\r
+                               "5d7193ca.62154c"\r
+                       ]\r
+               ]\r
+       },\r
+       {\r
+               "id": "d0a45cd.913bea",\r
+               "type": "comment",\r
+               "name": "SaltStack Adaptor DG",\r
+               "info": "",\r
+               "comments": "",\r
+               "x": 496,\r
+               "y": 6947.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": []\r
+       },\r
+       {\r
+               "id": "d1dc0fec.c80df",\r
+               "type": "comment",\r
+               "name": "request-method = reqExecCommand, req-action = \"execute a single non SLS command\"",\r
+               "info": "",\r
+               "comments": "",\r
+               "x": 516,\r
+               "y": 7027.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": []\r
+       },\r
+       {\r
+               "id": "ff042c47.a50c4",\r
+               "type": "comment",\r
+               "name": "Assumptions for this DG",\r
+               "info": "Here we assume, the saltstack server is the example-vagrant based server. Where, the master saltstact controlls minion1 and minion2. ",\r
+               "comments": "",\r
+               "x": 493,\r
+               "y": 6987.2001953125,\r
+               "z": "c817b245.e1acf",\r
+               "wires": []\r
+       }\r
 ]
\ No newline at end of file