Add missing payload for DGs and Playbooks of LCM APIs

Add missing payload for DGs and Playbooks of LCM:rollback,
LCM:upgrade-pre-check and LCM:upgrade-post-check.

Change-Id: I96d8d86af1200843f85b9ee8a0cc8abf6a0b8ec8
Issue-ID: SDNC-733
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Former-commit-id: 681d674c31d356fb46fa8301219878619185b68b

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml
new file mode 100644 (file)
index 0000000..ad4edf5
--- /dev/null
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_postcheck@0.01.yml
@@ -0,0 +1,33 @@
+---\r
+- hosts: all\r
+  tasks:\r
+  - name: create a temporary file for additional data\r
+    file: \r
+        path: /tmp/tmp-{{Id}}\r
+        state: touch\r
+    become: false\r
+\r
+  - name: prepare additional data\r
+    shell: echo {{additionalData}} > /tmp/tmp-{{Id}}\r
+    become: false\r
+\r
+  - name: execute post-check operation\r
+    shell: ./swm/upgrade-post-check {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}\r
+    ignore_errors: yes\r
+    register: postcheck_result\r
+\r
+  - name: write output to file\r
+    local_action: copy content="{{postcheck_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: postcheck_result.stdout != ""\r
+\r
+  - name: remove the temporary file\r
+    file:\r
+        path: /tmp/tmp-{{Id}}\r
+        state: absent\r
+    become: false\r
+\r
+  - name: use result of post-check as the result of Playbook\r
+    fail:\r
+      msg: "{{postcheck_result.stderr}}"\r
+    when: postcheck_result is failed\r
+\r

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml
new file mode 100644 (file)
index 0000000..668ed7d
--- /dev/null
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_precheck@0.01.yml
@@ -0,0 +1,33 @@
+---\r
+- hosts: all\r
+  tasks:\r
+  - name: create a temporary file for additional data\r
+    file: \r
+        path: /tmp/tmp-{{Id}}\r
+        state: touch\r
+    become: false\r
+\r
+  - name: prepare additional data\r
+    shell: echo {{additionalData}} > /tmp/tmp-{{Id}}\r
+    become: false\r
+\r
+  - name: execute pre-check operation\r
+    shell: ./swm/upgrade-pre-check {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}\r
+    ignore_errors: yes\r
+    register: precheck_result\r
+\r
+  - name: write output to file\r
+    local_action: copy content="{{precheck_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: precheck_result.stdout != ""\r
+\r
+  - name: remove the temporary file\r
+    file:\r
+        path: /tmp/tmp-{{Id}}\r
+        state: absent\r
+    become: false\r
+\r
+  - name: use result of pre-check as the result of Playbook\r
+    fail:\r
+      msg: "{{precheck_result.stderr}}"\r
+    when: precheck_result is failed\r
+\r

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml
index 0d20bc3..fa164c9 100644 (file)
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_rollback@0.00.yml
@@ -3,6 +3,16 @@
   tasks:\r
 \r
   - name: execute swFallback operation\r
-    shell: ./swm/swFallback.sh --filter {{filter}}\r
-    register: fallback__result\r
+    shell: ./swm/swFallback --filter {{filter}}\r
+    ignore_errors: yes\r
+    register: fallback_result\r
+    \r
+  - name: write output to file\r
+    local_action: copy content="{{fallback_result.stdout}}" dest="{{inventory_dir}}/{{inventory_hostname}}_results.txt"\r
+    when: fallback_result.stdout != ""\r
+\r
+  - name: use result of swFallback as the result of Playbook\r
+    fail:\r
+      msg: "{{fallback_result.stderr}}"\r
+    when: fallback_result is failed\r
 \r

diff --git a/platform-logic/lcm/src/main/json/LCM_rollback.json b/platform-logic/lcm/src/main/json/LCM_rollback.json
index 96adf3f..108d015 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_rollback.json
+++ b/platform-logic/lcm/src/main/json/LCM_rollback.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "367cac6c.e28ad4",\r
+        "id": "603c1b6d.6124c4",\r
         "type": "method",\r
         "name": "rollback",\r
         "xml": "<method rpc='rollback' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 606,\r
-        "y": 73,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 577,\r
+        "y": 47,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "397a12a.10f34ee"\r
+                "8f078f23.03658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7a7c5dd.d286a8",\r
+        "id": "88cbe26c.f2c83",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,679 +24,949 @@
         "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='LCM' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 393.99993896484375,\r
-        "y": 74,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 364.99993896484375,\r
+        "y": 48,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "367cac6c.e28ad4"\r
+                "603c1b6d.6124c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2749994d.fe16d6",\r
+        "id": "76631d3d.b2bda4",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$rollback-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 461.00001525878906,\r
-        "y": 681,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 432.00001525878906,\r
+        "y": 655,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "d80c72ca.e0d3b",\r
-                "3b639a7b.0ca876",\r
-                "f4b3d5c4.d9b698"\r
+                "86dfcb26.6ad318",\r
+                "ace54675.d37718",\r
+                "bac4c91b.f07a18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f74fb5f.f66a64",\r
+        "id": "4b37ff5.334c5",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.9999389648438,\r
-        "y": 789.0000305175781,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 831.9999389648438,\r
+        "y": 763.0000305175781,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "5e7ae3c.af98c1c",\r
-                "80745976.4dae58",\r
-                "2d735711.50c158"\r
+                "9a0bf3d2.1d44f",\r
+                "2ee77d61.9094f2",\r
+                "c9baa5a1.b1a3e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e7ae3c.af98c1c",\r
+        "id": "9a0bf3d2.1d44f",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1005.9999389648438,\r
-        "y": 787.0000381469727,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 976.9999389648438,\r
+        "y": 761.0000381469727,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "c157f020.8fa16"\r
+                "c81014d9.4af6a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80745976.4dae58",\r
+        "id": "2ee77d61.9094f2",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1002.9999389648438,\r
-        "y": 844.0000305175781,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 973.9999389648438,\r
+        "y": 818.0000305175781,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "8633c607.bab378"\r
+                "b8c25e18.a4534"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8633c607.bab378",\r
+        "id": "b8c25e18.a4534",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1190.9999389648438,\r
-        "y": 843.0000305175781,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1161,\r
+        "y": 818.0000610351562,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "7d406d3c.e2a7a4",\r
-                "c98b9933.a78a78"\r
+                "9fd8cd6c.24d13",\r
+                "f0a35f4d.9195a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b639a7b.0ca876",\r
+        "id": "ace54675.d37718",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 719.9999389648438,\r
-        "y": 702.0000915527344,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 690.9999389648438,\r
+        "y": 676.0000915527344,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "c157f020.8fa16"\r
+                "c81014d9.4af6a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d80c72ca.e0d3b",\r
+        "id": "86dfcb26.6ad318",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 721.9999389648438,\r
-        "y": 754.0000610351562,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 692.9999389648438,\r
+        "y": 728.0000610351562,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "3f74fb5f.f66a64"\r
+                "4b37ff5.334c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d406d3c.e2a7a4",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1359.9999389648438,\r
-        "y": 801.0000381469727,\r
-        "z": "6f1e5235.30d27c",\r
-        "wires": [\r
-            [\r
-                "c157f020.8fa16"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2d735711.50c158",\r
+        "id": "c9baa5a1.b1a3e8",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1002.9999389648438,\r
-        "y": 745.0000686645508,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 973.9999389648438,\r
+        "y": 719.0000686645508,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "c157f020.8fa16"\r
+                "c81014d9.4af6a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c98b9933.a78a78",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1367.9998779296875,\r
-        "y": 849.0001220703125,\r
-        "z": "6f1e5235.30d27c",\r
-        "wires": [\r
-            [\r
-                "5b424098.08bd5"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4e1d4556.7dd52c",\r
+        "id": "8024a972.fa79a8",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
         "comments": "",\r
-        "x": 1661.9998779296875,\r
-        "y": 906.0000610351562,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 2413.999755859375,\r
+        "y": 948.0000610351562,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d900eabd.53e918",\r
+        "id": "9e6a1fde.3d38e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 209,\r
-        "y": 73,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 180,\r
+        "y": 47,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "b7a7c5dd.d286a8"\r
+                "88cbe26c.f2c83"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "397a12a.10f34ee",\r
+        "id": "8f078f23.03658",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 206.9166259765625,\r
-        "y": 165.08331298828125,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 177.9166259765625,\r
+        "y": 139.08331298828125,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "2749994d.fe16d6",\r
-                "73725554.5774bc",\r
-                "8603ce63.b7c47",\r
-                "9a79bc82.279ce",\r
-                "cc7baeb9.6a3dc",\r
-                "b9b832a7.ed87d",\r
-                "16e37417.d2c8bc",\r
-                "763cfac9.48a8a4"\r
+                "76631d3d.b2bda4",\r
+                "18f99414.0f1f5c",\r
+                "e9a0ae4a.a010c",\r
+                "720dbe92.a2daf",\r
+                "90d2eba5.bddd78",\r
+                "e456084e.3d1b28",\r
+                "abd53cca.80312",\r
+                "86b92780.e4fd18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73725554.5774bc",\r
+        "id": "18f99414.0f1f5c",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 505.0000305175781,\r
-        "y": 198.08334350585938,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 476.0000305175781,\r
+        "y": 172.08334350585938,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c9d7b572.9b1b08",\r
+        "id": "dd58ea95.701bc8",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1671.9998779296875,\r
-        "y": 651.0834045410156,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1642.9998779296875,\r
+        "y": 625.0834045410156,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "18a85145.032faf"\r
+                "79c12f79.46a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18a85145.032faf",\r
+        "id": "79c12f79.46a5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1841.9998168945312,\r
-        "y": 650.0834045410156,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1812.9998168945312,\r
+        "y": 624.0834045410156,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "1f387472.1096ac"\r
+                "69422560.e902dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c157f020.8fa16",\r
+        "id": "c81014d9.4af6a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1474.9998168945312,\r
-        "y": 675.0834045410156,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1445.9998168945312,\r
+        "y": 649.0834045410156,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "c9d7b572.9b1b08",\r
-                "b8d2a948.9f6268",\r
-                "9c77e950.a59098"\r
+                "dd58ea95.701bc8",\r
+                "5a6746.ee1428bc",\r
+                "3c47a348.5e546c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "246949fc.089f56",\r
+        "id": "12844f47.97d421",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1672.4998779296875,\r
-        "y": 856.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1690.4998779296875,\r
+        "y": 924.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "3c6c9ce.ec3e364"\r
+                "cbef2423.2a36b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c6c9ce.ec3e364",\r
+        "id": "cbef2423.2a36b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1840.4998779296875,\r
-        "y": 856.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1877.5,\r
+        "y": 924.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "8c845e57.511d"\r
+                "9fd0c5ed.f195b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f387472.1096ac",\r
+        "id": "69422560.e902dc",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1961.9998779296875,\r
-        "y": 649.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1932.9998779296875,\r
+        "y": 623.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8d2a948.9f6268",\r
+        "id": "5a6746.ee1428bc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1653.91650390625,\r
-        "y": 702.0834045410156,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1624.91650390625,\r
+        "y": 676.0834045410156,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c845e57.511d",\r
+        "id": "9fd0c5ed.f195b8",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1968.9166259765625,\r
-        "y": 856.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 2019.91650390625,\r
+        "y": 924.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9c77e950.a59098",\r
+        "id": "3c47a348.5e546c",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1658.9998779296875,\r
-        "y": 598.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1629.9998779296875,\r
+        "y": 572.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b424098.08bd5",\r
+        "id": "542925f0.27fbdc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1495.9998779296875,\r
-        "y": 850.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 1482.9998779296875,\r
+        "y": 821.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "246949fc.089f56",\r
-                "4d96ab15.f92c04",\r
-                "4e1d4556.7dd52c"\r
+                "12844f47.97d421",\r
+                "e3737dc2.9a3b6",\r
+                "764a748a.61b14c",\r
+                "9775ae82.61b25",\r
+                "9a61d7f0.2347b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d96ab15.f92c04",\r
+        "id": "63386817.4a7cc8",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
         "comments": "",\r
-        "x": 1662.1666259765625,\r
-        "y": 801.0833740234375,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 2042.16650390625,\r
+        "y": 827.0833740234375,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4b3d5c4.d9b698",\r
+        "id": "bac4c91b.f07a18",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 728.9999389648438,\r
-        "y": 654.0000610351562,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 699.9999389648438,\r
+        "y": 628.0000610351562,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "9b946286.c1fc1"\r
+                "2763f6ed.1a7e1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c09132b.2c598c",\r
+        "id": "eb87e665.0acf88",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",\r
         "comments": "",\r
-        "x": 1019.9999389648438,\r
-        "y": 613,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 990.9999389648438,\r
+        "y": 587,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b946286.c1fc1",\r
+        "id": "2763f6ed.1a7e1a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 865.9999389648438,\r
-        "y": 648.0000610351562,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 836.9999389648438,\r
+        "y": 622.0000610351562,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "2c09132b.2c598c",\r
-                "c157f020.8fa16"\r
+                "eb87e665.0acf88",\r
+                "c81014d9.4af6a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8603ce63.b7c47",\r
+        "id": "e9a0ae4a.a010c",\r
         "type": "set",\r
         "name": "set default values",\r
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",\r
         "comments": "",\r
-        "x": 498,\r
-        "y": 245,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 469,\r
+        "y": 219,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16e37417.d2c8bc",\r
+        "id": "abd53cca.80312",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 426.9998779296875,\r
-        "y": 609,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 397.9998779296875,\r
+        "y": 583,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc7baeb9.6a3dc",\r
+        "id": "90d2eba5.bddd78",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 480,\r
-        "y": 346,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 451,\r
+        "y": 320,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "b515ebb.9b7de18",\r
-                "ea8f46f7.654968"\r
+                "97096eec.158be",\r
+                "db62c67c.f16678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a79bc82.279ce",\r
+        "id": "720dbe92.a2daf",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='rollback-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 512,\r
-        "y": 292,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 483,\r
+        "y": 266,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b515ebb.9b7de18",\r
+        "id": "97096eec.158be",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 677,\r
-        "y": 325,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 648,\r
+        "y": 299,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "d8920a01.f108b8"\r
+                "2baa8c31.1c7364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea8f46f7.654968",\r
+        "id": "db62c67c.f16678",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 677,\r
-        "y": 386,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 648,\r
+        "y": 360,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "32f9eda7.1c1082"\r
+                "e8ec5d49.26bb5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32f9eda7.1c1082",\r
+        "id": "e8ec5d49.26bb5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 824.9999389648438,\r
-        "y": 385,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 795.9999389648438,\r
+        "y": 359,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "3756c2a1.fa5d6e"\r
+                "d1d2edc3.c0ebb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8920a01.f108b8",\r
+        "id": "2baa8c31.1c7364",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>\n",\r
         "comments": "",\r
-        "x": 838,\r
-        "y": 323,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 809,\r
+        "y": 297,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9b832a7.ed87d",\r
+        "id": "e456084e.3d1b28",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 477,\r
-        "y": 477,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 448,\r
+        "y": 451,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "5725646c.c7b37c"\r
+                "852cba96.1b8598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5725646c.c7b37c",\r
+        "id": "852cba96.1b8598",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 648,\r
-        "y": 478,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 619,\r
+        "y": 452,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "4546e558.72429c"\r
+                "c3a06545.f22d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4546e558.72429c",\r
+        "id": "c3a06545.f22d98",\r
         "type": "set",\r
         "name": "set playbookname",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.rollback.playbookname`'/>",\r
         "comments": "",\r
-        "x": 838,\r
-        "y": 477,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 809,\r
+        "y": 451,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "763cfac9.48a8a4",\r
+        "id": "86b92780.e4fd18",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 467,\r
-        "y": 536,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 438,\r
+        "y": 510,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "76eb51c0.552ce",\r
-                "178c823.496cd7e"\r
+                "314228d.17719d8",\r
+                "d39f4666.4c5158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76eb51c0.552ce",\r
+        "id": "314228d.17719d8",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 647,\r
-        "y": 529,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 618,\r
+        "y": 503,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "66b6e37a.9e852c"\r
+                "e384eccc.6fd13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66b6e37a.9e852c",\r
+        "id": "e384eccc.6fd13",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 804,\r
-        "y": 543,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 775,\r
+        "y": 517,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
     },\r
     {\r
-        "id": "178c823.496cd7e",\r
+        "id": "d39f4666.4c5158",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 646,\r
-        "y": 573,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 617,\r
+        "y": 547,\r
+        "z": "deca6c6e.62787",\r
         "wires": [\r
             [\r
-                "66b6e37a.9e852c"\r
+                "e384eccc.6fd13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3756c2a1.fa5d6e",\r
+        "id": "d1d2edc3.c0ebb",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='Currently only support PNF.' />",\r
         "comments": "",\r
-        "x": 998,\r
-        "y": 385,\r
-        "z": "6f1e5235.30d27c",\r
+        "x": 969,\r
+        "y": 359,\r
+        "z": "deca6c6e.62787",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "e3737dc2.9a3b6",\r
+        "type": "execute",\r
+        "name": "execute jsonStringToCtx",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1703,\r
+        "y": 741,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "764a748a.61b14c",\r
+        "type": "execute",\r
+        "name": "execute getAttributeValue",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1709,\r
+        "y": 796,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9775ae82.61b25",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1694,\r
+        "y": 854,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "17082276.b4933e",\r
+                "55bb01f1.008aa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ba985798.6d2de8",\r
+        "type": "set",\r
+        "name": "set DmaapReq with payload",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='rollback'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2080,\r
+        "y": 873,\r
+        "z": "deca6c6e.62787",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "17082276.b4933e",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1876,\r
+        "y": 827,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "63386817.4a7cc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55bb01f1.008aa",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1875,\r
+        "y": 873,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "ba985798.6d2de8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a556bfd0.26234",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1875,\r
+        "y": 970,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "921bd724.038378"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bfa7e392.13bb3",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1875,\r
+        "y": 1046,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "37bee539.62e3ea"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9a61d7f0.2347b8",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1691,\r
+        "y": 1009,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "a556bfd0.26234",\r
+                "bfa7e392.13bb3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dbab97fc.ffb6e8",\r
+        "type": "returnSuccess",\r
+        "name": "return success with payload",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2455,\r
+        "y": 1030,\r
+        "z": "deca6c6e.62787",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f0a35f4d.9195a",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1343.9998779296875,\r
+        "y": 841.0001220703125,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "542925f0.27fbdc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9fd8cd6c.24d13",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1340.9998779296875,\r
+        "y": 799.0000610351562,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "542925f0.27fbdc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "921bd724.038378",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2050,\r
+        "y": 970,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "292c4dcf.7880e2",\r
+                "73b035d4.ad062c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "37bee539.62e3ea",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2050,\r
+        "y": 1046,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "7e470c4a.386af4",\r
+                "5feb02a4.d890ac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7ef093b7.2cf64c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
+        "comments": "",\r
+        "x": 2408,\r
+        "y": 986,\r
+        "z": "deca6c6e.62787",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b08c6ff3.d3ef1",\r
+        "type": "returnFailure",\r
+        "name": "return failure with payload",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2451,\r
+        "y": 1068,\r
+        "z": "deca6c6e.62787",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "292c4dcf.7880e2",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2238,\r
+        "y": 948,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "8024a972.fa79a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73b035d4.ad062c",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2219,\r
+        "y": 986,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "7ef093b7.2cf64c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7e470c4a.386af4",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2239,\r
+        "y": 1030,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "dbab97fc.ffb6e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5feb02a4.d890ac",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2221,\r
+        "y": 1068,\r
+        "z": "deca6c6e.62787",\r
+        "wires": [\r
+            [\r
+                "b08c6ff3.d3ef1"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index 3808648..aad0514 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "fab0f7ed.c486b8",\r
+        "id": "fe0acee3.b3d4f",\r
         "type": "method",\r
         "name": "upgrade-post-check",\r
         "xml": "<method rpc='upgrade-post-check' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 480,\r
-        "y": 147,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 523,\r
+        "y": 71,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "5ccc8e8d.06e5"\r
+                "88d3f9c3.91e818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c791eb8.0072b",\r
+        "id": "dd69f330.0db38",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,790 +24,1060 @@
         "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='LCM' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 267.99993896484375,\r
-        "y": 148,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 310.99993896484375,\r
+        "y": 72,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "fab0f7ed.c486b8"\r
+                "fe0acee3.b3d4f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3503ece1.d7ad14",\r
+        "id": "ca77e1d2.5f235",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-post-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 335.00001525878906,\r
-        "y": 755,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 378.00001525878906,\r
+        "y": 679,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "734b2c42.973ee4",\r
-                "bb8a76ca.fb7058",\r
-                "a457fe79.46497"\r
+                "98532a13.9e8648",\r
+                "300b9189.6839ae",\r
+                "93689f4a.8157"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17ff2aa.67075",\r
+        "id": "338f7649.ef4e9a",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 734.9999389648438,\r
-        "y": 863.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 777.9999389648438,\r
+        "y": 787.0000305175781,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "7ad5787f.1c20f8",\r
-                "b6f779a3.cc7ed8",\r
-                "f695f05e.abf31"\r
+                "13e6fdd5.284672",\r
+                "558456ec.861628",\r
+                "d84c0d6b.4e961"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ad5787f.1c20f8",\r
+        "id": "13e6fdd5.284672",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.9999389648438,\r
-        "y": 861.0000381469727,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 922.9999389648438,\r
+        "y": 785.0000381469727,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "d4f3b77a.b39508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6f779a3.cc7ed8",\r
+        "id": "558456ec.861628",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.9999389648438,\r
-        "y": 918.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 919.9999389648438,\r
+        "y": 842.0000305175781,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "1a65bc45.b2fcb4"\r
+                "a1c39fcf.a06c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a65bc45.b2fcb4",\r
+        "id": "a1c39fcf.a06c",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1064.9999389648438,\r
-        "y": 917.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1107.9999389648438,\r
+        "y": 841.0000305175781,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "5b0d24c6.9eb0ac",\r
-                "2b5e4322.1d495c"\r
+                "f58c60bb.b391f",\r
+                "b18d4538.e8ef28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb8a76ca.fb7058",\r
+        "id": "300b9189.6839ae",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 593.9999389648438,\r
-        "y": 776.0000915527344,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 636.9999389648438,\r
+        "y": 700.0000915527344,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "d4f3b77a.b39508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "734b2c42.973ee4",\r
+        "id": "98532a13.9e8648",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 595.9999389648438,\r
-        "y": 828.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 638.9999389648438,\r
+        "y": 752.0000610351562,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "f17ff2aa.67075"\r
+                "338f7649.ef4e9a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b0d24c6.9eb0ac",\r
+        "id": "f58c60bb.b391f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1233.9999389648438,\r
-        "y": 875.0000381469727,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1278.9998779296875,\r
+        "y": 820.0000610351562,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "44e1b1d0.b5bf9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f695f05e.abf31",\r
+        "id": "d84c0d6b.4e961",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.9999389648438,\r
-        "y": 819.0000686645508,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 919.9999389648438,\r
+        "y": 743.0000686645508,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "d4f3b77a.b39508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5e4322.1d495c",\r
+        "id": "b18d4538.e8ef28",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1241.9998779296875,\r
-        "y": 923.0001220703125,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1281.9998779296875,\r
+        "y": 871.0001220703125,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "db1e6d62.a1404"\r
+                "44e1b1d0.b5bf9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1a2b259.11e46",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
-        "comments": "",\r
-        "x": 1535.9998779296875,\r
-        "y": 980.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "566f9779.c05d38",\r
+        "id": "67392fb2.3fda3",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 83,\r
-        "y": 147,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 126,\r
+        "y": 71,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "5c791eb8.0072b"\r
+                "dd69f330.0db38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ccc8e8d.06e5",\r
+        "id": "88d3f9c3.91e818",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 80.91668701171875,\r
-        "y": 239.08334350585938,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 123.91668701171875,\r
+        "y": 163.08334350585938,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "3503ece1.d7ad14",\r
-                "dc18f7c9.2e4ac8",\r
-                "814875d2.cac108",\r
-                "e9d89bdf.30f7a8",\r
-                "69e97f86.e07ef",\r
-                "fa9a8e1f.bba53",\r
-                "baba22fc.1ceb5",\r
-                "81510405.ca8868"\r
+                "ca77e1d2.5f235",\r
+                "c7ec6050.45978",\r
+                "889f84ed.e111e8",\r
+                "40652fca.65d24",\r
+                "983b7f00.0aa95",\r
+                "43b098aa.2b8088",\r
+                "3c8d18f4.57a768",\r
+                "5c9efc94.d81d24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc18f7c9.2e4ac8",\r
+        "id": "c7ec6050.45978",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 379.0000305175781,\r
-        "y": 272.0833435058594,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 422.0000305175781,\r
+        "y": 196.08334350585938,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "70d1c79a.089af8",\r
+        "id": "d9d2286.379c4d8",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1545.9998779296875,\r
-        "y": 725.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1588.9998779296875,\r
+        "y": 649.0834045410156,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "d776c76b.1dd188"\r
+                "642ae55d.535a7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d776c76b.1dd188",\r
+        "id": "642ae55d.535a7c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1715.9998168945312,\r
-        "y": 724.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1758.9998168945312,\r
+        "y": 648.0834045410156,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "eac6c260.d11fc"\r
+                "7969554f.e56e0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b54a991.b17b16",\r
+        "id": "d4f3b77a.b39508",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1348.9998168945312,\r
-        "y": 749.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1391.9998168945312,\r
+        "y": 673.0834045410156,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "70d1c79a.089af8",\r
-                "7970fcd5.6f11b4",\r
-                "3d8934f9.d0339c"\r
+                "d9d2286.379c4d8",\r
+                "8a00ee98.85d8c",\r
+                "a967853.2e08a78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e790e11b.4f947",\r
+        "id": "61a865a3.81374c",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1546.4998779296875,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1600.4998779296875,\r
+        "y": 904.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "2e13891.034f576"\r
+                "bf6e3414.ac0ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e13891.034f576",\r
+        "id": "bf6e3414.ac0ab8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1714.4998779296875,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1782.4998779296875,\r
+        "y": 904.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "30475e40.9b8be2"\r
+                "a98ac8b6.1c8b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eac6c260.d11fc",\r
+        "id": "7969554f.e56e0c",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1835.9998779296875,\r
-        "y": 723.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1878.9998779296875,\r
+        "y": 647.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7970fcd5.6f11b4",\r
+        "id": "8a00ee98.85d8c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1527.91650390625,\r
-        "y": 776.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1570.91650390625,\r
+        "y": 700.0834045410156,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30475e40.9b8be2",\r
+        "id": "a98ac8b6.1c8b18",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1842.9166259765625,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1912.9166259765625,\r
+        "y": 904.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3d8934f9.d0339c",\r
+        "id": "a967853.2e08a78",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1532.9998779296875,\r
-        "y": 672.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1575.9998779296875,\r
+        "y": 596.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db1e6d62.a1404",\r
+        "id": "44e1b1d0.b5bf9",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1369.9998779296875,\r
-        "y": 924.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1406.9998779296875,\r
+        "y": 845.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "e790e11b.4f947",\r
-                "3a3f1d44.898da2",\r
-                "c1a2b259.11e46"\r
+                "61a865a3.81374c",\r
+                "af2360f3.a1b32",\r
+                "c058b1a3.cafa7",\r
+                "d59d4575.f7aa08",\r
+                "97b68625.59c538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a3f1d44.898da2",\r
+        "id": "72836a7a.768624",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1536.1666259765625,\r
-        "y": 875.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1938.1666259765625,\r
+        "y": 819.0833740234375,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a457fe79.46497",\r
+        "id": "93689f4a.8157",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 602.9999389648438,\r
-        "y": 728.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 645.9999389648438,\r
+        "y": 652.0000610351562,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "3d4c2c9a.7b1324"\r
+                "c92e96da.bead68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d512629f.bc625",\r
+        "id": "3705b5ae.a55ada",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",\r
         "comments": "",\r
-        "x": 893.9999389648438,\r
-        "y": 687,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 936.9999389648438,\r
+        "y": 611,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d4c2c9a.7b1324",\r
+        "id": "c92e96da.bead68",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739.9999389648438,\r
-        "y": 722.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 782.9999389648438,\r
+        "y": 646.0000610351562,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "d512629f.bc625",\r
-                "2b54a991.b17b16"\r
+                "3705b5ae.a55ada",\r
+                "d4f3b77a.b39508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "814875d2.cac108",\r
+        "id": "889f84ed.e111e8",\r
         "type": "set",\r
         "name": "set default values",\r
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",\r
         "comments": "",\r
-        "x": 372,\r
-        "y": 319,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 415,\r
+        "y": 243,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "442dbdff.6dfcb4",\r
+        "id": "9e2047bf.84ca98",\r
         "type": "get-resource",\r
         "name": "get aai.generic-vnf ",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-post-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 912,\r
-        "y": 495,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 955,\r
+        "y": 419,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "1e57cb28.122ad5"\r
+                "db67679b.d5f7f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e57cb28.122ad5",\r
+        "id": "db67679b.d5f7f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1070.3907470703125,\r
-        "y": 493.28399658203125,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1113.3907470703125,\r
+        "y": 417.28399658203125,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "5a65efc0.bf413"\r
+                "9f78147c.45b0d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baba22fc.1ceb5",\r
+        "id": "3c8d18f4.57a768",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 300.9998779296875,\r
-        "y": 683,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 343.9998779296875,\r
+        "y": 607,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "69e97f86.e07ef",\r
+        "id": "983b7f00.0aa95",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 354,\r
-        "y": 420,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 397,\r
+        "y": 344,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "e43265e9.4c7f38",\r
-                "d78c93da.7125f"\r
+                "6ab53366.6b679c",\r
+                "c2f80dd0.8d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9d89bdf.30f7a8",\r
+        "id": "40652fca.65d24",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-post-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 386,\r
-        "y": 366,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 429,\r
+        "y": 290,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e43265e9.4c7f38",\r
+        "id": "6ab53366.6b679c",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 551,\r
-        "y": 399,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 594,\r
+        "y": 323,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "abbc4ae4.be5328"\r
+                "b2f335c.b319ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d78c93da.7125f",\r
+        "id": "c2f80dd0.8d1",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550.9999389648438,\r
-        "y": 460,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 593.9999389648438,\r
+        "y": 384,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "f68ee407.ca6d88"\r
+                "64084999.263e28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f68ee407.ca6d88",\r
+        "id": "64084999.263e28",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 698.9999389648438,\r
-        "y": 459,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 741.9999389648438,\r
+        "y": 383,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "442dbdff.6dfcb4",\r
-                "80c560bb.eea5f"\r
+                "9e2047bf.84ca98",\r
+                "1c2838e7.02c327"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abbc4ae4.be5328",\r
+        "id": "b2f335c.b319ac8",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-post-check.playbookname`'/>\n",\r
         "comments": "",\r
-        "x": 712,\r
-        "y": 397,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 755,\r
+        "y": 321,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80c560bb.eea5f",\r
+        "id": "1c2838e7.02c327",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921,\r
-        "y": 439,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 964,\r
+        "y": 363,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa9a8e1f.bba53",\r
+        "id": "43b098aa.2b8088",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 351,\r
-        "y": 551,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 394,\r
+        "y": 475,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "1a5624d2.74e98b"\r
+                "f5a4d554.8310a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a5624d2.74e98b",\r
+        "id": "f5a4d554.8310a8",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 522,\r
-        "y": 552,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 565,\r
+        "y": 476,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "524c17a1.30fbf8"\r
+                "e3207caa.85b44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "524c17a1.30fbf8",\r
+        "id": "e3207caa.85b44",\r
         "type": "set",\r
         "name": "set playbookname",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>",\r
         "comments": "",\r
-        "x": 712,\r
-        "y": 551,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 755,\r
+        "y": 475,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81510405.ca8868",\r
+        "id": "5c9efc94.d81d24",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 341,\r
-        "y": 610,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 384,\r
+        "y": 534,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "7a126f.d2de2d9",\r
-                "8743a074.e8506"\r
+                "77224991.c20a78",\r
+                "2deab8c5.642298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a126f.d2de2d9",\r
+        "id": "77224991.c20a78",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 521,\r
-        "y": 603,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 564,\r
+        "y": 527,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "c954af6f.c34df"\r
+                "3881d027.425ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c954af6f.c34df",\r
+        "id": "3881d027.425ff",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 678,\r
-        "y": 617,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 721,\r
+        "y": 541,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8743a074.e8506",\r
+        "id": "2deab8c5.642298",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 520,\r
-        "y": 647,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 563,\r
+        "y": 571,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "c954af6f.c34df"\r
+                "3881d027.425ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90b2891b.001708",\r
+        "id": "153ed401.962ddc",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1396,\r
-        "y": 482,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1439,\r
+        "y": 406,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "c9dd0d76.432f7"\r
+                "3cfaf009.20065"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dd0d76.432f7",\r
+        "id": "3cfaf009.20065",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1574,\r
-        "y": 482,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1617,\r
+        "y": 406,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "6ea15b2b.d9cd74"\r
+                "8e725f1f.6662f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9706bdee.6acf9",\r
+        "id": "9e70216f.c9b2f",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
         "comments": "",\r
-        "x": 1369,\r
-        "y": 535,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1412,\r
+        "y": 459,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a65efc0.bf413",\r
+        "id": "9f78147c.45b0d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1199,\r
-        "y": 492,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1242,\r
+        "y": 416,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             [\r
-                "90b2891b.001708",\r
-                "9706bdee.6acf9"\r
+                "153ed401.962ddc",\r
+                "9e70216f.c9b2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ea15b2b.d9cd74",\r
+        "id": "8e725f1f.6662f",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-post-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1746,\r
-        "y": 480,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1789,\r
+        "y": 404,\r
+        "z": "b4969602.e5a2a8",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "af2360f3.a1b32",\r
+        "type": "execute",\r
+        "name": "execute jsonStringToCtx",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1616,\r
+        "y": 750,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c058b1a3.cafa7",\r
+        "type": "execute",\r
+        "name": "execute getAttributeValue",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1622,\r
+        "y": 793,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d59d4575.f7aa08",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1606,\r
+        "y": 840,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "676d5ce5.e9d864",\r
+                "8ecd1678.ebdff8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "676d5ce5.e9d864",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1783,\r
+        "y": 819,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "72836a7a.768624"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8ecd1678.ebdff8",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1782,\r
+        "y": 859,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "5f5e736e.9d3b8c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f5e736e.9d3b8c",\r
+        "type": "set",\r
+        "name": "set DmaapReq with payload",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 1980,\r
+        "y": 859,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bd7deada.205038",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
+        "comments": "",\r
+        "x": 2322,\r
+        "y": 937,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "530e9d63.07dd34",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1788.000244140625,\r
+        "y": 958.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "aba50f21.a535d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d6c0e471.9108d8",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1787.000244140625,\r
+        "y": 1034.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "801dd50e.8622c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "97b68625.59c538",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1605.000244140625,\r
+        "y": 994.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "530e9d63.07dd34",\r
+                "d6c0e471.9108d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "acbbf9db.eeba28",\r
+        "type": "returnSuccess",\r
+        "name": "return success with payload",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2363.000244140625,\r
+        "y": 1018.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "aba50f21.a535d",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1958.000244140625,\r
+        "y": 958.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "3ac4241b.62144c",\r
+                "c67e4b5c.d70a28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "801dd50e.8622c8",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1958.000244140625,\r
+        "y": 1034.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "8dcd3ae3.608a58",\r
+                "a94e8dc6.52647"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "657ecc9e.2687c4",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
+        "comments": "",\r
+        "x": 2316.000244140625,\r
+        "y": 974.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "52f49f6f.dcf4",\r
+        "type": "returnFailure",\r
+        "name": "return failure with payload",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2359.000244140625,\r
+        "y": 1056.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3ac4241b.62144c",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2146.000244140625,\r
+        "y": 936.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "bd7deada.205038"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c67e4b5c.d70a28",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2127.000244140625,\r
+        "y": 974.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "657ecc9e.2687c4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8dcd3ae3.608a58",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2147.000244140625,\r
+        "y": 1018.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "acbbf9db.eeba28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a94e8dc6.52647",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2129.000244140625,\r
+        "y": 1056.9999389648438,\r
+        "z": "b4969602.e5a2a8",\r
+        "wires": [\r
+            [\r
+                "52f49f6f.dcf4"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
index 8657b53..aa78a91 100644 (file)
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "fab0f7ed.c486b8",\r
+        "id": "e17c1584.f756d8",\r
         "type": "method",\r
         "name": "upgrade-pre-check",\r
         "xml": "<method rpc='upgrade-pre-check' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 480,\r
-        "y": 147,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 552,\r
+        "y": 67,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "5ccc8e8d.06e5"\r
+                "4a691c8b.6b9db4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c791eb8.0072b",\r
+        "id": "1f7a861d.c2112a",\r
         "type": "service-logic",\r
         "name": "LCM ${project.version}",\r
         "module": "LCM",\r
@@ -24,790 +24,1060 @@
         "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='LCM' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 267.99993896484375,\r
-        "y": 148,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 339.99993896484375,\r
+        "y": 68,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "fab0f7ed.c486b8"\r
+                "e17c1584.f756d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3503ece1.d7ad14",\r
+        "id": "bb18ce54.65a6d",\r
         "type": "execute",\r
         "name": "execute AnsibleA.reqExec",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$upgrade-pre-check-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 335.00001525878906,\r
-        "y": 755,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 407.00001525878906,\r
+        "y": 675,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "734b2c42.973ee4",\r
-                "bb8a76ca.fb7058",\r
-                "a457fe79.46497"\r
+                "c6f98872.c067e8",\r
+                "5614f2d4.83759c",\r
+                "1beab9a5.7e2366"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17ff2aa.67075",\r
+        "id": "8e97cc56.5d143",\r
         "type": "switchNode",\r
         "name": "switch",\r
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 734.9999389648438,\r
-        "y": 863.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 806.9999389648438,\r
+        "y": 783.0000305175781,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "7ad5787f.1c20f8",\r
-                "b6f779a3.cc7ed8",\r
-                "f695f05e.abf31"\r
+                "d5d391c0.e33eb",\r
+                "96569d9a.8f849",\r
+                "8eb6da31.c976d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ad5787f.1c20f8",\r
+        "id": "d5d391c0.e33eb",\r
         "type": "other",\r
         "name": "outcome 500",\r
         "xml": "<outcome value='500'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.9999389648438,\r
-        "y": 861.0000381469727,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 951.9999389648438,\r
+        "y": 781.0000381469727,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "261676ae.6c18ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6f779a3.cc7ed8",\r
+        "id": "96569d9a.8f849",\r
         "type": "other",\r
         "name": "outcome 100",\r
         "xml": "<outcome value='100'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.9999389648438,\r
-        "y": 918.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 948.9999389648438,\r
+        "y": 838.0000305175781,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "1a65bc45.b2fcb4"\r
+                "a9aeb5d4.ad8218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a65bc45.b2fcb4",\r
+        "id": "a9aeb5d4.ad8218",\r
         "type": "execute",\r
         "name": "execute reqExecResult",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n    <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$playbookname`'/>\n\t\n\n\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1064.9999389648438,\r
-        "y": 917.0000305175781,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1136.9999389648438,\r
+        "y": 837.0000305175781,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "5b0d24c6.9eb0ac",\r
-                "2b5e4322.1d495c"\r
+                "50e30f80.cb97b",\r
+                "f9b1e44f.cf0bf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb8a76ca.fb7058",\r
+        "id": "5614f2d4.83759c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 593.9999389648438,\r
-        "y": 776.0000915527344,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 665.9999389648438,\r
+        "y": 696.0000915527344,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "261676ae.6c18ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "734b2c42.973ee4",\r
+        "id": "c6f98872.c067e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 595.9999389648438,\r
-        "y": 828.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 667.9999389648438,\r
+        "y": 748.0000610351562,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "f17ff2aa.67075"\r
+                "8e97cc56.5d143"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b0d24c6.9eb0ac",\r
+        "id": "50e30f80.cb97b",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1233.9999389648438,\r
-        "y": 875.0000381469727,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1305.9998779296875,\r
+        "y": 819.0000610351562,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "7ac364bd.12e01c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f695f05e.abf31",\r
+        "id": "8eb6da31.c976d8",\r
         "type": "other",\r
         "name": "outcome 101",\r
         "xml": "<outcome value='101'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 876.9999389648438,\r
-        "y": 819.0000686645508,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 948.9999389648438,\r
+        "y": 739.0000686645508,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "2b54a991.b17b16"\r
+                "261676ae.6c18ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5e4322.1d495c",\r
+        "id": "f9b1e44f.cf0bf8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1241.9998779296875,\r
-        "y": 923.0001220703125,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1309.9998779296875,\r
+        "y": 863.0001220703125,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "db1e6d62.a1404"\r
+                "7ac364bd.12e01c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1a2b259.11e46",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
-        "comments": "",\r
-        "x": 1535.9998779296875,\r
-        "y": 980.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "566f9779.c05d38",\r
+        "id": "a40759ed.63a388",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 83,\r
-        "y": 147,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 155,\r
+        "y": 67,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "5c791eb8.0072b"\r
+                "1f7a861d.c2112a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ccc8e8d.06e5",\r
+        "id": "4a691c8b.6b9db4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 80.91668701171875,\r
-        "y": 239.08334350585938,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 152.91668701171875,\r
+        "y": 159.08334350585938,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "3503ece1.d7ad14",\r
-                "dc18f7c9.2e4ac8",\r
-                "814875d2.cac108",\r
-                "e9d89bdf.30f7a8",\r
-                "69e97f86.e07ef",\r
-                "fa9a8e1f.bba53",\r
-                "baba22fc.1ceb5",\r
-                "81510405.ca8868"\r
+                "bb18ce54.65a6d",\r
+                "4f789742.ddd168",\r
+                "2f15d339.87cf0c",\r
+                "556d2c3e.217c14",\r
+                "905f1137.7562f",\r
+                "5cc58e7c.083a5",\r
+                "db896c60.3d19a",\r
+                "ae5d9d02.d1fe4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc18f7c9.2e4ac8",\r
+        "id": "4f789742.ddd168",\r
         "type": "execute",\r
         "name": "execute Properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 379.0000305175781,\r
-        "y": 272.0833435058594,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 451.0000305175781,\r
+        "y": 192.08334350585938,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "70d1c79a.089af8",\r
+        "id": "9f29e934.d196d8",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1545.9998779296875,\r
-        "y": 725.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1617.9998779296875,\r
+        "y": 645.0834045410156,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "d776c76b.1dd188"\r
+                "eff6b07f.5f555"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d776c76b.1dd188",\r
+        "id": "eff6b07f.5f555",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1715.9998168945312,\r
-        "y": 724.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1787.9998168945312,\r
+        "y": 644.0834045410156,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "eac6c260.d11fc"\r
+                "39c1e046.0c9a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b54a991.b17b16",\r
+        "id": "261676ae.6c18ea",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1348.9998168945312,\r
-        "y": 749.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1420.9998168945312,\r
+        "y": 669.0834045410156,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "70d1c79a.089af8",\r
-                "7970fcd5.6f11b4",\r
-                "3d8934f9.d0339c"\r
+                "9f29e934.d196d8",\r
+                "20f5321f.fe2dee",\r
+                "b16d5209.3031f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e790e11b.4f947",\r
+        "id": "dd99789.6491a88",\r
         "type": "execute",\r
         "name": "execute DmaapMsg",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\n    <parameter name='restapiUser' value='`$prop.lcm.dmaap.user`' />\n    <parameter name='restapiPassword' value='`$prop.lcm.dmaap.password`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='contentType' value='application/json' />\n    <parameter name=\"responsePrefix\" value=\"lcm\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1546.4998779296875,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1653.4998779296875,\r
+        "y": 911.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "2e13891.034f576"\r
+                "16bb547b.d2861c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e13891.034f576",\r
+        "id": "16bb547b.d2861c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1714.4998779296875,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1838.4998779296875,\r
+        "y": 911.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "30475e40.9b8be2"\r
+                "95e8f51a.226ea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eac6c260.d11fc",\r
+        "id": "39c1e046.0c9a2",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1835.9998779296875,\r
-        "y": 723.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1907.9998779296875,\r
+        "y": 643.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7970fcd5.6f11b4",\r
+        "id": "20f5321f.fe2dee",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
         "comments": "",\r
-        "x": 1527.91650390625,\r
-        "y": 776.0834045410156,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1599.91650390625,\r
+        "y": 696.0834045410156,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30475e40.9b8be2",\r
+        "id": "95e8f51a.226ea8",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='Failed to Publish to DMaap'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1842.9166259765625,\r
-        "y": 930.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1970.9166259765625,\r
+        "y": 911.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3d8934f9.d0339c",\r
+        "id": "b16d5209.3031f",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1532.9998779296875,\r
-        "y": 672.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1604.9998779296875,\r
+        "y": 592.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db1e6d62.a1404",\r
+        "id": "7ac364bd.12e01c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1369.9998779296875,\r
-        "y": 924.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1441.9998779296875,\r
+        "y": 838.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "e790e11b.4f947",\r
-                "3a3f1d44.898da2",\r
-                "c1a2b259.11e46"\r
+                "dd99789.6491a88",\r
+                "66ca1a2.98ef5e4",\r
+                "6f78d9df.0d3518",\r
+                "3c0a54ab.00262c",\r
+                "9977ea00.521808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a3f1d44.898da2",\r
+        "id": "b364bef1.e2765",\r
         "type": "set",\r
         "name": "set DmaapReq",\r
         "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",\r
         "comments": "",\r
-        "x": 1536.1666259765625,\r
-        "y": 875.0833740234375,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1995.1666259765625,\r
+        "y": 816.0833740234375,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a457fe79.46497",\r
+        "id": "1beab9a5.7e2366",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 602.9999389648438,\r
-        "y": 728.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 674.9999389648438,\r
+        "y": 648.0000610351562,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "3d4c2c9a.7b1324"\r
+                "dd0b1351.6bec5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d512629f.bc625",\r
+        "id": "6e45eb8e.292b44",\r
         "type": "set",\r
         "name": "set Defaults",\r
         "xml": "<set>\n<parameter name='org.onap.appc.adapter.ansible.result.code' value='401'/>\n<parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\n",\r
         "comments": "",\r
-        "x": 893.9999389648438,\r
-        "y": 687,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 965.9999389648438,\r
+        "y": 607,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d4c2c9a.7b1324",\r
+        "id": "dd0b1351.6bec5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739.9999389648438,\r
-        "y": 722.0000610351562,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 811.9999389648438,\r
+        "y": 642.0000610351562,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "d512629f.bc625",\r
-                "2b54a991.b17b16"\r
+                "6e45eb8e.292b44",\r
+                "261676ae.6c18ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "814875d2.cac108",\r
+        "id": "2f15d339.87cf0c",\r
         "type": "set",\r
         "name": "set default values",\r
         "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n<parameter name='quote' value=\"'\" />\n",\r
         "comments": "",\r
-        "x": 372,\r
-        "y": 319,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 444,\r
+        "y": 239,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "442dbdff.6dfcb4",\r
+        "id": "3bd1d194.63001e",\r
         "type": "get-resource",\r
         "name": "get aai.generic-vnf ",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-pre-check-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 912,\r
-        "y": 495,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 984,\r
+        "y": 415,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "1e57cb28.122ad5"\r
+                "d0549989.50cdf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e57cb28.122ad5",\r
+        "id": "d0549989.50cdf8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1070.3907470703125,\r
-        "y": 493.28399658203125,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1142.3907470703125,\r
+        "y": 413.28399658203125,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "5a65efc0.bf413"\r
+                "50890a76.58d434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baba22fc.1ceb5",\r
+        "id": "db896c60.3d19a",\r
         "type": "record",\r
         "name": "record",\r
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\"> \n\t<parameter name=\"logger\" value=\"message-log\"/> \n\t<parameter name=\"field1\" value='`$playbookname`'/>\n\t<parameter name=\"field2\" value='`$nodelist`'/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 300.9998779296875,\r
-        "y": 683,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 372.9998779296875,\r
+        "y": 603,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "69e97f86.e07ef",\r
+        "id": "905f1137.7562f",\r
         "type": "switchNode",\r
         "name": "switch pnf-flag",\r
         "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 354,\r
-        "y": 420,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 426,\r
+        "y": 340,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "e43265e9.4c7f38",\r
-                "d78c93da.7125f"\r
+                "d4a98e23.62f9b",\r
+                "a403044b.ebc9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9d89bdf.30f7a8",\r
+        "id": "556d2c3e.217c14",\r
         "type": "execute",\r
         "name": "execute jsonStringToCtx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-pre-check-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 386,\r
-        "y": 366,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 458,\r
+        "y": 286,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e43265e9.4c7f38",\r
+        "id": "d4a98e23.62f9b",\r
         "type": "outcome",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 551,\r
-        "y": 399,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 623,\r
+        "y": 319,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "abbc4ae4.be5328"\r
+                "582ec79b.faa468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d78c93da.7125f",\r
+        "id": "a403044b.ebc9f8",\r
         "type": "outcome",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550.9999389648438,\r
-        "y": 460,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 622.9999389648438,\r
+        "y": 380,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "f68ee407.ca6d88"\r
+                "3184e083.2b204"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f68ee407.ca6d88",\r
+        "id": "3184e083.2b204",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 698.9999389648438,\r
-        "y": 459,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 770.9999389648438,\r
+        "y": 379,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "442dbdff.6dfcb4",\r
-                "80c560bb.eea5f"\r
+                "3bd1d194.63001e",\r
+                "395906a2.acd1ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abbc4ae4.be5328",\r
+        "id": "582ec79b.faa468",\r
         "type": "set",\r
         "name": "set AnsibleReq",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-pre-check.playbookname`'/>\n",\r
         "comments": "",\r
-        "x": 712,\r
-        "y": 397,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 784,\r
+        "y": 317,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80c560bb.eea5f",\r
+        "id": "395906a2.acd1ea",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921,\r
-        "y": 439,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 993,\r
+        "y": 359,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa9a8e1f.bba53",\r
+        "id": "5cc58e7c.083a5",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 351,\r
-        "y": 551,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 423,\r
+        "y": 471,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "1a5624d2.74e98b"\r
+                "b9c121b9.01765"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a5624d2.74e98b",\r
+        "id": "b9c121b9.01765",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 522,\r
-        "y": 552,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 594,\r
+        "y": 472,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "524c17a1.30fbf8"\r
+                "96dc86e8.19da88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "524c17a1.30fbf8",\r
+        "id": "96dc86e8.19da88",\r
         "type": "set",\r
         "name": "set playbookname",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>",\r
         "comments": "",\r
-        "x": 712,\r
-        "y": 551,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 784,\r
+        "y": 471,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81510405.ca8868",\r
+        "id": "ae5d9d02.d1fe4",\r
         "type": "switchNode",\r
         "name": "switch nodelist",\r
         "xml": "<switch test='`$nodelist`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 341,\r
-        "y": 610,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 413,\r
+        "y": 530,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "7a126f.d2de2d9",\r
-                "8743a074.e8506"\r
+                "d47821da.1dd48",\r
+                "69b2cec2.dd018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a126f.d2de2d9",\r
+        "id": "d47821da.1dd48",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 521,\r
-        "y": 603,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 593,\r
+        "y": 523,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "c954af6f.c34df"\r
+                "dce9b14d.bb77b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c954af6f.c34df",\r
+        "id": "dce9b14d.bb77b",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",\r
         "comments": "",\r
-        "x": 678,\r
-        "y": 617,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 750,\r
+        "y": 537,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8743a074.e8506",\r
+        "id": "69b2cec2.dd018",\r
         "type": "outcome",\r
         "name": "empty",\r
         "xml": "<outcome value=\"['']\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 520,\r
-        "y": 647,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 592,\r
+        "y": 567,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "c954af6f.c34df"\r
+                "dce9b14d.bb77b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90b2891b.001708",\r
+        "id": "8d045871.31f638",\r
         "type": "switchNode",\r
         "name": "switch playbookname",\r
         "xml": "<switch test='`$playbookname`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1396,\r
-        "y": 482,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1468,\r
+        "y": 402,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "c9dd0d76.432f7"\r
+                "ef1e7a17.621f38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dd0d76.432f7",\r
+        "id": "ef1e7a17.621f38",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1574,\r
-        "y": 482,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1646,\r
+        "y": 402,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "6ea15b2b.d9cd74"\r
+                "862a6ea8.3ba16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9706bdee.6acf9",\r
+        "id": "8543ebcf.2ead48",\r
         "type": "set",\r
         "name": "set nodelist",\r
         "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",\r
         "comments": "",\r
-        "x": 1369,\r
-        "y": 535,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1441,\r
+        "y": 455,\r
+        "z": "df893cfa.16f38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a65efc0.bf413",\r
+        "id": "50890a76.58d434",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1199,\r
-        "y": 492,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1271,\r
+        "y": 412,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             [\r
-                "90b2891b.001708",\r
-                "9706bdee.6acf9"\r
+                "8d045871.31f638",\r
+                "8543ebcf.2ead48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ea15b2b.d9cd74",\r
+        "id": "862a6ea8.3ba16",\r
         "type": "execute",\r
         "name": "set playbookname",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.upgrade-pre-check.playbookname'`\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1746,\r
-        "y": 480,\r
-        "z": "50de34e0.ace54c",\r
+        "x": 1818,\r
+        "y": 400,\r
+        "z": "df893cfa.16f38",\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "66ca1a2.98ef5e4",\r
+        "type": "execute",\r
+        "name": "execute jsonStringToCtx",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='org.onap.appc.adapter.ansible.results' />\n\t<parameter name='outputPath' value='resultsJson' />\n\t<parameter name='isEscaped' value='false' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1668,\r
+        "y": 744,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6f78d9df.0d3518",\r
+        "type": "execute",\r
+        "name": "execute getAttributeValue",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='source' value=\"`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`\" />\n\t<parameter name='outputPath' value='outputPayload' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1674,\r
+        "y": 789,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "3c0a54ab.00262c",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1660,\r
+        "y": 836,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "65b8d06e.2f308",\r
+                "db2edf05.5dbf2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "65b8d06e.2f308",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1838,\r
+        "y": 816,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "b364bef1.e2765"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "db2edf05.5dbf2",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1839,\r
+        "y": 860,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "3b020d0b.edb822"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b020d0b.edb822",\r
+        "type": "set",\r
+        "name": "set DmaapReq with payload",\r
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2036,\r
+        "y": 860,\r
+        "z": "df893cfa.16f38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e583cc0b.79586",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>",\r
+        "comments": "",\r
+        "x": 2371,\r
+        "y": 946.9999389648438,\r
+        "z": "df893cfa.16f38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b678b572.4bc6d8",\r
+        "type": "outcome",\r
+        "name": "null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1837.000244140625,\r
+        "y": 968.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "bebb9bde.cadbc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e71f0e75.f5e6e",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1836.000244140625,\r
+        "y": 1044.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "a34ae1ab.50555"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9977ea00.521808",\r
+        "type": "switchNode",\r
+        "name": "switch outputPayload",\r
+        "xml": "<switch test='`$outputPayload`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1654.000244140625,\r
+        "y": 1004.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "b678b572.4bc6d8",\r
+                "e71f0e75.f5e6e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c888915f.7e81c",\r
+        "type": "returnSuccess",\r
+        "name": "return success with payload",\r
+        "xml": "<return status='success'>\n<parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n<parameter name='payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2412.000244140625,\r
+        "y": 1028.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bebb9bde.cadbc8",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2007.000244140625,\r
+        "y": 968.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "1b395046.b5f6",\r
+                "d4989dec.88a2e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a34ae1ab.50555",\r
+        "type": "switchNode",\r
+        "name": "switch result code",\r
+        "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2007.000244140625,\r
+        "y": 1044.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "8e9f2082.ee767",\r
+                "3b44f0c3.4b7c2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e9a3c.5f7e95c4",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",\r
+        "comments": "",\r
+        "x": 2365.000244140625,\r
+        "y": 984.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "398f4135.fd470e",\r
+        "type": "returnFailure",\r
+        "name": "return failure with payload",\r
+        "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n<parameter name='payload' value='`$outputPayload`'/>",\r
+        "comments": "",\r
+        "x": 2408.000244140625,\r
+        "y": 1066.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1b395046.b5f6",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2195.000244140625,\r
+        "y": 946.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "e583cc0b.79586"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d4989dec.88a2e",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2176.000244140625,\r
+        "y": 984.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "5e9a3c.5f7e95c4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8e9f2082.ee767",\r
+        "type": "other",\r
+        "name": "outcome 400",\r
+        "xml": "<outcome value='400'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2196.000244140625,\r
+        "y": 1028.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "c888915f.7e81c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b44f0c3.4b7c2",\r
+        "type": "outcome",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2178.000244140625,\r
+        "y": 1066.9998779296875,\r
+        "z": "df893cfa.16f38",\r
+        "wires": [\r
+            [\r
+                "398f4135.fd470e"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/lcm/src/main/xml/LCM_rollback.xml b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
index bb540b6..dd24063 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_rollback.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
@@ -250,23 +250,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='rollback'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -283,31 +316,96 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='failure'>\r
-                                            <parameter name='status.code' value='401' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                                 <outcome value='success'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='rollback'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -324,10 +422,42 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='success'>\r
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                             </execute>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index 3338f1c..a772373 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -271,23 +271,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -304,31 +337,96 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='failure'>\r
-                                            <parameter name='status.code' value='401' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                                 <outcome value='success'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -345,10 +443,42 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='success'>\r
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                             </execute>\r

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
index 1bf68e5..28f7048 100644 (file)
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -271,23 +271,56 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>\r
                                 <outcome value='failure'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -304,31 +337,96 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='failure'>\r
-                                            <parameter name='status.code' value='401' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                                 <outcome value='success'>\r
                                     <block>\r
-                                        <set>\r
-                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
-                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
-                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
-                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
-                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
-                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
-                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
-                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
-                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
-                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </set>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\r
+                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />\r
+                                            <parameter name='outputPath' value='resultsJson' />\r
+                                            <parameter name='isEscaped' value='false' />\r
+                                        </execute>\r
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\r
+                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />\r
+                                            <parameter name='outputPath' value='outputPayload' />\r
+                                        </execute>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <set>\r
+                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
+                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-pre-check-input.common-header.request-id + '-' + $upgrade-pre-check-input.common-header.sub-request-id`"/>\r
+                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\r
+                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-pre-check'/>\r
+                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
+                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-pre-check-input.common-header.timestamp`'/>\r
+                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-pre-check-input.common-header.api-ver`'/>\r
+                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-pre-check-input.common-header.originator-id`'/>\r
+                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-pre-check-input.common-header.sub-request-id`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-pre-check-input.common-header.flags.mode`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-pre-check-input.common-header.flags.force`'/>\r
+                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-pre-check-input.common-header.flags.ttl`'/>\r
+                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                    <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />\r
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />\r
@@ -345,10 +443,42 @@
                                                 </record>\r
                                             </outcome>\r
                                         </execute>\r
-                                        <return status='success'>\r
-                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
-                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
-                                        </return>\r
+                                        <switch test='`$outputPayload`'>\r
+                                            <outcome value=''>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                            <outcome value='Other'>\r
+                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                                    <outcome value='400'>\r
+                                                        <return status='success'>\r
+                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                    <outcome value='Other'>\r
+                                                        <return status='failure'>\r
+                                                            <parameter name='status.code' value='401' />\r
+                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                            <parameter name='payload' value='`$outputPayload`'/>\r
+                                                        </return>\r
+                                                    </outcome>\r
+                                                </switch>\r
+                                            </outcome>\r
+                                        </switch>\r
                                     </block>\r
                                 </outcome>\r
                             </execute>\r