X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Flcm%2Fsrc%2Fmain%2Fjson%2FLCM_upgrade-software.json;h=656abb45a982eeade9259f86ba12e52401f65261;hb=6bfa161b215c1ef18c300b7cebe064f8aeebb230;hp=a239a2ed2e51dfbf83d7b018dee17ba5a9ef3842;hpb=9c037e68b5f1fd3acbac7fd77c428b71932b896b;p=sdnc%2Foam.git

diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index a239a2ed..656abb45 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -1,478 +1,813 @@
 [
     {
-        "id": "2189c37f.7d745c",
+        "id": "d52a9fe6.4a061",
         "type": "method",
         "name": "upgrade-software",
         "xml": "<method rpc='upgrade-software' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 524,
-        "y": 203,
-        "z": "f89ff8f8.fd73f8",
+        "x": 544,
+        "y": 52,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "200bd935.5c4296"
+                "8be92af7.e48088"
             ]
         ]
     },
     {
-        "id": "33405b66.254a24",
+        "id": "b090596a.f30168",
         "type": "service-logic",
-        "name": "LCM ${project.version}",
+        "name": "LCM 1.4.5",
         "module": "LCM",
-        "version": "${project.version}",
+        "version": "1.4.5",
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>",
         "outputs": 1,
-        "x": 311.99993896484375,
-        "y": 204,
-        "z": "f89ff8f8.fd73f8",
+        "x": 331.99993896484375,
+        "y": 53,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "2189c37f.7d745c"
+                "d52a9fe6.4a061"
             ]
         ]
     },
     {
-        "id": "70d63640.e2d148",
+        "id": "2f057096.50046",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "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-software-input.payload`'/>\n<parameter name='NodeList' value='`$prop.ansible.nodelist`'/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+        "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-software-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-software-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
-        "x": 312.00001525878906,
-        "y": 421,
-        "z": "f89ff8f8.fd73f8",
+        "x": 399.00001525878906,
+        "y": 660,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "a9686655.3f4ab8",
-                "22afa298.2efb1e",
-                "447f65a.9f7919c"
+                "f4a52a80.3301f8",
+                "4c3969ef.3ad0e8",
+                "519ffe08.0c9b3"
             ]
         ]
     },
     {
-        "id": "4a011b96.270794",
+        "id": "5a208b8c.11bad4",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test=\"`$org.onap.appc.adapter.ansible.result.code`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 613,
-        "y": 469,
-        "z": "f89ff8f8.fd73f8",
+        "x": 798.9999389648438,
+        "y": 768.0000305175781,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "c0abf3c2.456f8",
-                "4d37ed5a.7d21b4",
-                "3dce5412.8af8ac"
+                "e1869f29.6536c",
+                "43f57bf1.626ff4",
+                "c32ffe89.d048e"
             ]
         ]
     },
     {
-        "id": "c0abf3c2.456f8",
+        "id": "e1869f29.6536c",
         "type": "other",
         "name": "outcome 500",
         "xml": "<outcome value='500'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 758,
-        "y": 467.00000762939453,
-        "z": "f89ff8f8.fd73f8",
+        "x": 943.9999389648438,
+        "y": 766.0000381469727,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "41ed13b3.d624bc"
+                "398fd4fb.d6173c"
             ]
         ]
     },
     {
-        "id": "4d37ed5a.7d21b4",
+        "id": "43f57bf1.626ff4",
         "type": "other",
         "name": "outcome 100",
         "xml": "<outcome value='100'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 761,
-        "y": 510.00003814697266,
-        "z": "f89ff8f8.fd73f8",
+        "x": 940.9999389648438,
+        "y": 823.0000305175781,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "936b39d4.8b5a38"
+                "f88fcab6.006eb8"
             ]
         ]
     },
     {
-        "id": "936b39d4.8b5a38",
+        "id": "f88fcab6.006eb8",
         "type": "execute",
         "name": "execute reqExecResult",
-        "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='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 939.0000305175781,
-        "y": 510.00003814697266,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1128.9999389648438,
+        "y": 822.0000305175781,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "ca460fcf.02e98",
-                "296c3998.c540f6"
+                "73432b98.4b25e4",
+                "bd487c1a.8c998"
             ]
         ]
     },
     {
-        "id": "22afa298.2efb1e",
+        "id": "4c3969ef.3ad0e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 504,
-        "y": 378.0000305175781,
-        "z": "f89ff8f8.fd73f8",
+        "x": 657.9999389648438,
+        "y": 681.0000915527344,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "41ed13b3.d624bc"
+                "398fd4fb.d6173c"
             ]
         ]
     },
     {
-        "id": "a9686655.3f4ab8",
+        "id": "f4a52a80.3301f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 506,
-        "y": 430,
-        "z": "f89ff8f8.fd73f8",
+        "x": 659.9999389648438,
+        "y": 733.0000610351562,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "4a011b96.270794"
+                "5a208b8c.11bad4"
             ]
         ]
     },
     {
-        "id": "ca460fcf.02e98",
+        "id": "73432b98.4b25e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1100.0000610351562,
-        "y": 487.00000762939453,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1297.9999389648438,
+        "y": 780.0000381469727,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "41ed13b3.d624bc"
+                "398fd4fb.d6173c"
             ]
         ]
     },
     {
-        "id": "3dce5412.8af8ac",
+        "id": "c32ffe89.d048e",
         "type": "other",
         "name": "outcome 101",
         "xml": "<outcome value='101'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 755,
-        "y": 425.00003814697266,
-        "z": "f89ff8f8.fd73f8",
+        "x": 940.9999389648438,
+        "y": 724.0000686645508,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "41ed13b3.d624bc"
+                "398fd4fb.d6173c"
             ]
         ]
     },
     {
-        "id": "296c3998.c540f6",
+        "id": "bd487c1a.8c998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.0000610351562,
-        "y": 535.0000381469727,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1305.9998779296875,
+        "y": 828.0001220703125,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "7b87f117.b4313"
+                "adb9b1a6.61eb5"
             ]
         ]
     },
     {
-        "id": "94bc239f.d51ed",
+        "id": "2b291cab.721924",
         "type": "returnSuccess",
         "name": "return success",
         "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`'/>",
         "comments": "",
-        "x": 1389.9999389648438,
-        "y": 587.0000381469727,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1599.9998779296875,
+        "y": 885.0000610351562,
+        "z": "d0eb0cbd.ae56e",
         "wires": []
     },
     {
-        "id": "1018873c.0eea29",
+        "id": "db787a9a.5729a8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 127,
-        "y": 203,
-        "z": "f89ff8f8.fd73f8",
+        "x": 147,
+        "y": 52,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "33405b66.254a24"
+                "b090596a.f30168"
             ]
         ]
     },
     {
-        "id": "200bd935.5c4296",
+        "id": "8be92af7.e48088",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 122.91668701171875,
-        "y": 384.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 144.91668701171875,
+        "y": 144.08334350585938,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "70d63640.e2d148",
-                "da0d3fe2.9fb83",
-                "ff90e7e4.933fd8"
+                "2f057096.50046",
+                "f86ff952.0492a8",
+                "e1e7ef0d.bad94",
+                "3f387094.3465e",
+                "1f8f1867.c1cf08",
+                "4e2df025.06262",
+                "690e9c9d.3aca34",
+                "3ebaf64f.5a6c4a"
             ]
         ]
     },
     {
-        "id": "da0d3fe2.9fb83",
+        "id": "f86ff952.0492a8",
         "type": "execute",
         "name": "execute Properties",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 297.00001525878906,
-        "y": 326.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 443.0000305175781,
+        "y": 177.08334350585938,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9671ba3.d82fd8",
+        "id": "70a47606.d49438",
         "type": "execute",
         "name": "execute DmaapMsg",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1107.0000610351562,
-        "y": 331.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1609.9998779296875,
+        "y": 630.0834045410156,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "54800975.8a5fa8"
+                "34ac5379.9a844c"
             ]
         ]
     },
     {
-        "id": "54800975.8a5fa8",
+        "id": "34ac5379.9a844c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1277,
-        "y": 330.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1779.9998168945312,
+        "y": 629.0834045410156,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "a3e81bc7.85e588"
+                "fb390c18.77a19"
             ]
         ]
     },
     {
-        "id": "41ed13b3.d624bc",
+        "id": "398fd4fb.d6173c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 910,
-        "y": 355.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1412.9998168945312,
+        "y": 654.0834045410156,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "e9671ba3.d82fd8",
-                "efa1ef26.9748",
-                "a558be34.99d0b"
+                "70a47606.d49438",
+                "d82deaf3.a98988",
+                "df7a754d.479a48"
             ]
         ]
     },
     {
-        "id": "62a61f1a.99219",
+        "id": "add47742.421838",
         "type": "execute",
         "name": "execute DmaapMsg",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1410.4999389648438,
-        "y": 536.0833511352539,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1610.4998779296875,
+        "y": 835.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "24389a0d.bab8f6"
+                "5ad46d9d.c433d4"
             ]
         ]
     },
     {
-        "id": "24389a0d.bab8f6",
+        "id": "5ad46d9d.c433d4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1570.4999389648438,
-        "y": 536.0833511352539,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1778.4998779296875,
+        "y": 835.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "b8153372.37ed8"
+                "a1c42905.fff878"
             ]
         ]
     },
     {
-        "id": "a3e81bc7.85e588",
+        "id": "fb390c18.77a19",
         "type": "record",
         "name": "record",
         "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'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1409,
-        "y": 330.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1899.9998779296875,
+        "y": 628.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             []
         ]
     },
     {
-        "id": "efa1ef26.9748",
+        "id": "d82deaf3.a98988",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='status.code' value='401' />\n<parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\n",
         "comments": "",
-        "x": 1081.9166870117188,
-        "y": 368.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1591.91650390625,
+        "y": 681.0834045410156,
+        "z": "d0eb0cbd.ae56e",
         "wires": []
     },
     {
-        "id": "b8153372.37ed8",
+        "id": "a1c42905.fff878",
         "type": "record",
         "name": "record",
         "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'/>",
         "comments": "",
         "outputs": 1,
-        "x": 1691.9166870117188,
-        "y": 537.0833511352539,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1906.9166259765625,
+        "y": 835.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a558be34.99d0b",
+        "id": "df7a754d.479a48",
         "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
+        "name": "set DmaapReq",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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",
         "comments": "",
-        "x": 1059.0000610351562,
-        "y": 278.0833435058594,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1596.9998779296875,
+        "y": 577.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": []
     },
     {
-        "id": "7b87f117.b4313",
+        "id": "adb9b1a6.61eb5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1239.9999389648438,
-        "y": 535.0833206176758,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1433.9998779296875,
+        "y": 829.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "62a61f1a.99219",
-                "5099c108.ef352",
-                "94bc239f.d51ed"
+                "add47742.421838",
+                "ff897b1a.9583f8",
+                "2b291cab.721924"
             ]
         ]
     },
     {
-        "id": "5099c108.ef352",
+        "id": "ff897b1a.9583f8",
         "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\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",
+        "name": "set DmaapReq",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$upgrade-software-input.common-header.request-id + '-' + $upgrade-software-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-software'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$upgrade-software-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$upgrade-software-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$upgrade-software-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$upgrade-software-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-software-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-software-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$upgrade-software-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-software-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",
         "comments": "",
-        "x": 1370.1666870117188,
-        "y": 488.0833511352539,
-        "z": "f89ff8f8.fd73f8",
+        "x": 1600.1666259765625,
+        "y": 780.0833740234375,
+        "z": "d0eb0cbd.ae56e",
         "wires": []
     },
     {
-        "id": "447f65a.9f7919c",
+        "id": "519ffe08.0c9b3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 500,
-        "y": 331,
-        "z": "f89ff8f8.fd73f8",
+        "x": 666.9999389648438,
+        "y": 633.0000610351562,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "a4cded3a.e3895"
+                "e32c4a6d.892558"
             ]
         ]
     },
     {
-        "id": "7586b55c.6c594c",
+        "id": "8405f654.a242a8",
         "type": "set",
         "name": "set Defaults",
-        "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",
+        "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",
         "comments": "",
-        "x": 884,
-        "y": 278,
-        "z": "f89ff8f8.fd73f8",
+        "x": 957.9999389648438,
+        "y": 592,
+        "z": "d0eb0cbd.ae56e",
         "wires": []
     },
     {
-        "id": "a4cded3a.e3895",
+        "id": "e32c4a6d.892558",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 684,
-        "y": 323,
-        "z": "f89ff8f8.fd73f8",
+        "x": 803.9999389648438,
+        "y": 627.0000610351562,
+        "z": "d0eb0cbd.ae56e",
         "wires": [
             [
-                "7586b55c.6c594c",
-                "41ed13b3.d624bc"
+                "8405f654.a242a8",
+                "398fd4fb.d6173c"
             ]
         ]
     },
     {
-        "id": "ff90e7e4.933fd8",
+        "id": "e1e7ef0d.bad94",
         "type": "set",
-        "name": "set default status value",
-        "xml": "<set>\n<parameter name='status.code' value='200' />\n<parameter name='status.message' value='unexpected return from DG' />\n",
+        "name": "set default values",
+        "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",
         "comments": "",
-        "x": 311,
-        "y": 370,
-        "z": "f89ff8f8.fd73f8",
+        "x": 436,
+        "y": 224,
+        "z": "d0eb0cbd.ae56e",
         "wires": []
+    },
+    {
+        "id": "62ae5ec1.69479",
+        "type": "get-resource",
+        "name": "get aai.generic-vnf ",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $upgrade-software-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 978,
+        "y": 415,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "45f13d8e.2baab4"
+            ]
+        ]
+    },
+    {
+        "id": "45f13d8e.2baab4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1134.3907470703125,
+        "y": 398.28399658203125,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "374bb3b9.6cefec"
+            ]
+        ]
+    },
+    {
+        "id": "690e9c9d.3aca34",
+        "type": "record",
+        "name": "record",
+        "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`'/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 364.9998779296875,
+        "y": 588,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1f8f1867.c1cf08",
+        "type": "switchNode",
+        "name": "switch pnf-flag",
+        "xml": "<switch test='`$payloadJson.pnf-flag`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 418,
+        "y": 325,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "5b32bef7.b059e",
+                "f5bcff23.7649a"
+            ]
+        ]
+    },
+    {
+        "id": "3f387094.3465e",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='upgrade-software-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 450,
+        "y": 271,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5b32bef7.b059e",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 615,
+        "y": 304,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "a02f543f.407778"
+            ]
+        ]
+    },
+    {
+        "id": "f5bcff23.7649a",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 614.9999389648438,
+        "y": 365,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "4ae3a7c9.907f18"
+            ]
+        ]
+    },
+    {
+        "id": "4ae3a7c9.907f18",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 762.9999389648438,
+        "y": 364,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "62ae5ec1.69479",
+                "fc28a02d.cc248"
+            ]
+        ]
+    },
+    {
+        "id": "a02f543f.407778",
+        "type": "set",
+        "name": "set AnsibleReq",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`\"/>\n<parameter name='playbookname' value='`$prop.lcm.pnf.upgrade-software.playbookname`'/>\n",
+        "comments": "",
+        "x": 776,
+        "y": 302,
+        "z": "d0eb0cbd.ae56e",
+        "wires": []
+    },
+    {
+        "id": "fc28a02d.cc248",
+        "type": "execute",
+        "name": "set playbookname",
+        "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-software.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 976,
+        "y": 312,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4e2df025.06262",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 415,
+        "y": 456,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "6164fda7.628474"
+            ]
+        ]
+    },
+    {
+        "id": "6164fda7.628474",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 586,
+        "y": 457,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "789294b0.3e8a8c"
+            ]
+        ]
+    },
+    {
+        "id": "789294b0.3e8a8c",
+        "type": "set",
+        "name": "set playbookname",
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.upgrade-software.playbookname`'/>",
+        "comments": "",
+        "x": 776,
+        "y": 456,
+        "z": "d0eb0cbd.ae56e",
+        "wires": []
+    },
+    {
+        "id": "3ebaf64f.5a6c4a",
+        "type": "switchNode",
+        "name": "switch nodelist",
+        "xml": "<switch test='`$nodelist`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 405,
+        "y": 515,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "12193ca9.50e163",
+                "8146ae4e.2b29b"
+            ]
+        ]
+    },
+    {
+        "id": "12193ca9.50e163",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 585,
+        "y": 508,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "b589f932.9ec108"
+            ]
+        ]
+    },
+    {
+        "id": "b589f932.9ec108",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`$prop.ansible.nodelist`\"/>",
+        "comments": "",
+        "x": 742,
+        "y": 522,
+        "z": "d0eb0cbd.ae56e",
+        "wires": []
+    },
+    {
+        "id": "8146ae4e.2b29b",
+        "type": "outcome",
+        "name": "empty",
+        "xml": "<outcome value=\"['']\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 584,
+        "y": 552,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "b589f932.9ec108"
+            ]
+        ]
+    },
+    {
+        "id": "94498b41.794368",
+        "type": "switchNode",
+        "name": "switch playbookname",
+        "xml": "<switch test='`$playbookname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1460,
+        "y": 387,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "975c4b05.0f6d08"
+            ]
+        ]
+    },
+    {
+        "id": "975c4b05.0f6d08",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1638,
+        "y": 387,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "eee08f4b.ee327"
+            ]
+        ]
+    },
+    {
+        "id": "7c4590ff.245c9",
+        "type": "set",
+        "name": "set nodelist",
+        "xml": "<set>\n<parameter name='nodelist' value=\"`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`\"/>\n",
+        "comments": "",
+        "x": 1433,
+        "y": 440,
+        "z": "d0eb0cbd.ae56e",
+        "wires": []
+    },
+    {
+        "id": "374bb3b9.6cefec",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1263,
+        "y": 397,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            [
+                "94498b41.794368",
+                "7c4590ff.245c9"
+            ]
+        ]
+    },
+    {
+        "id": "eee08f4b.ee327",
+        "type": "execute",
+        "name": "set playbookname",
+        "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-software.playbookname'`\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1810,
+        "y": 385,
+        "z": "d0eb0cbd.ae56e",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file