From: Dan Timoney <dtimoney@att.com>
Date: Fri, 24 May 2019 15:18:18 +0000 (+0000)
Subject: Merge "SDNC-766: Refactoring of installCerts.py"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fb2f48179f8532e52687ddf1051d1344c8d0f2df;hp=bcd48edd5a8b23ceec4ca665bfedb43437f6b05f;p=sdnc%2Foam.git

Merge "SDNC-766: Refactoring of installCerts.py"
---

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json
index d2164e72..de0dfdf5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "a5295fa5.2cebc",
+        "id": "f0a981bd.88fcb",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 105,
-        "y": 31,
-        "z": "b3572fdc.57a7c",
+        "x": 117,
+        "y": 75,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "91ec004b.fde43"
+                "a665a331.b55d"
             ]
         ]
     },
     {
-        "id": "91ec004b.fde43",
+        "id": "a665a331.b55d",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1053 +22,1065 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 381,
-        "y": 32,
-        "z": "b3572fdc.57a7c",
+        "x": 393,
+        "y": 76,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "8873b97.77d8048"
+                "c81bde26.d0259"
             ]
         ]
     },
     {
-        "id": "8873b97.77d8048",
+        "id": "c81bde26.d0259",
         "type": "method",
         "name": "self-serve-pnf-ra-assignment",
         "xml": "<method rpc='self-serve-pnf-ra-assignment' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 237,
-        "y": 82,
-        "z": "b3572fdc.57a7c",
+        "x": 250.00001525878906,
+        "y": 129.00000762939453,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "871f97d8.236f68"
+                "55728079.b669b"
             ]
         ]
     },
     {
-        "id": "871f97d8.236f68",
+        "id": "55728079.b669b",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 200.16664123535156,
-        "y": 133.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 212.16664123535156,
+        "y": 177.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "1d7f791b.bbebb7",
-                "809ef1f2.9d13a",
-                "dfab7c99.217af",
-                "e9a6ef1b.98436",
-                "36dea652.27073a",
-                "937d5326.69965",
-                "e221b302.f0199",
-                "864aa7c9.1f7118",
-                "2ad3fcee.93df44",
-                "3461757d.afec6a",
-                "b7b3409c.b7131",
-                "cb318b66.0796c8",
-                "3d6976b6.27f80a",
-                "94bf3501.be3848",
-                "a566a00c.4994a"
+                "ded0fa5f.1cc958",
+                "da49825b.f212e",
+                "e804e40a.3348d8",
+                "c602f6a.b7d2b08",
+                "110c1be6.299a84",
+                "11ca6e3a.745ed2",
+                "3087bf64.dce3e",
+                "3cae11e4.851bfe",
+                "83f9cf68.29fa4",
+                "59d259e0.595458",
+                "7696cfe3.25742",
+                "906be4e1.f2f3b8",
+                "59d1a840.b9e3b8",
+                "7eebfe0.8659a04",
+                "9f59e925.e7ed18",
+                "c4d5f704.d66b18"
             ]
         ]
     },
     {
-        "id": "809ef1f2.9d13a",
+        "id": "da49825b.f212e",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n   <parameter name=\"request-id\" value=\"`$tmp.return.generate.pnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-type`\" />  \n   <parameter name=\"resource-id\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-id`\" />   \n   <parameter name=\"action-name\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n",
+        "xml": "<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>    \n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.pnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n",
         "comments": "",
-        "x": 385.9166603088379,
-        "y": 178.08333015441895,
-        "z": "b3572fdc.57a7c",
+        "x": 397.9166603088379,
+        "y": 222.08333015441895,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "961e1d7.52131e",
+        "id": "fc9300fc.e62da",
         "type": "get-resource",
         "name": "get-resource VF_MODEL",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n  \n\n",
         "comments": "",
         "outputs": 1,
-        "x": 924.8094635009766,
-        "y": 569.6189861297607,
-        "z": "b3572fdc.57a7c",
+        "x": 936.8094635009766,
+        "y": 613.6189861297607,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "d57245a1.3d8f88",
-                "b3bcf1b9.7736d",
-                "8b4b4f46.8310f"
+                "27e699d9.486f86",
+                "3868ab1a.84cf94",
+                "c4b3e20a.976c9"
             ]
         ]
     },
     {
-        "id": "d57245a1.3d8f88",
+        "id": "27e699d9.486f86",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1169.8095626831055,
-        "y": 518.904709815979,
-        "z": "b3572fdc.57a7c",
+        "x": 1181.8095626831055,
+        "y": 562.904709815979,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "e952f42f.db9b58"
+                "980d344b.b7a248"
             ]
         ]
     },
     {
-        "id": "e952f42f.db9b58",
+        "id": "980d344b.b7a248",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",
         "comments": "",
-        "x": 1342.8095626831055,
-        "y": 517.904709815979,
-        "z": "b3572fdc.57a7c",
+        "x": 1354.8095626831055,
+        "y": 561.904709815979,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "d8999389.3a4ec",
+        "id": "c69ac6a5.a782c8",
         "type": "set",
         "name": "set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n<parameter name='tmp.sdnc-artifact-name' value='`$db1.vf-model.sdnc-artifact-name`' />\n\n\n\n\n",
         "comments": "",
-        "x": 1545.2380638122559,
-        "y": 619.047513961792,
-        "z": "b3572fdc.57a7c",
+        "x": 1557.2380638122559,
+        "y": 663.047513961792,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "a316c173.c965a",
+        "id": "64c18674.de26f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No VF_MODEL found where customization_uuid = ' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid`\" />\n",
         "comments": "",
-        "x": 1344.8095626831055,
-        "y": 566.904709815979,
-        "z": "b3572fdc.57a7c",
+        "x": 1356.8095626831055,
+        "y": 610.904709815979,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "36dea652.27073a",
+        "id": "110c1be6.299a84",
         "type": "switchNode",
         "name": "switch: model info == NULL",
         "xml": "<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.sdnc-artifact-name == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 445.80946350097656,
-        "y": 570.6189861297607,
-        "z": "b3572fdc.57a7c",
+        "x": 457.80946350097656,
+        "y": 614.6189861297607,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "ea42d6d6.3100d8"
+                "5004e54f.2514ac"
             ]
         ]
     },
     {
-        "id": "b3bcf1b9.7736d",
+        "id": "3868ab1a.84cf94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1175.8095626831055,
-        "y": 567.904709815979,
-        "z": "b3572fdc.57a7c",
+        "x": 1187.8095626831055,
+        "y": 611.904709815979,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "a316c173.c965a"
+                "64c18674.de26f8"
             ]
         ]
     },
     {
-        "id": "ea42d6d6.3100d8",
+        "id": "5004e54f.2514ac",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>",
         "comments": "",
         "outputs": 1,
-        "x": 694.8094635009766,
-        "y": 570.6189861297607,
-        "z": "b3572fdc.57a7c",
+        "x": 706.8094635009766,
+        "y": 614.6189861297607,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "961e1d7.52131e"
+                "fc9300fc.e62da"
             ]
         ]
     },
     {
-        "id": "e9a6ef1b.98436",
+        "id": "c602f6a.b7d2b08",
         "type": "for",
         "name": "for pnf-topology-operation-input",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 461.66664123535156,
-        "y": 370.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 473.66664123535156,
+        "y": 414.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "13eb53e4.18313c"
+                "8c0bf6a3.a5bba8"
             ]
         ]
     },
     {
-        "id": "13eb53e4.18313c",
+        "id": "8c0bf6a3.a5bba8",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 683.6666412353516,
-        "y": 369.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 695.6666412353516,
+        "y": 413.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "b51d5848.247668"
+                "aaf46ed5.322dd"
             ]
         ]
     },
     {
-        "id": "9d71fcdf.711af",
+        "id": "6da0f254.b738bc",
         "type": "set",
         "name": "set tmp.sdnc-model-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n",
         "comments": "",
-        "x": 1334.6666412353516,
-        "y": 302.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 1346.6666412353516,
+        "y": 346.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "6bfa0dba.32b084",
+        "id": "870f2532.302988",
         "type": "outcome",
         "name": "sdnc_model_name",
         "xml": "<outcome value='sdnc_model_name'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1080.6666412353516,
-        "y": 302.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 1092.6666412353516,
+        "y": 346.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "9d71fcdf.711af"
+                "6da0f254.b738bc"
             ]
         ]
     },
     {
-        "id": "b51d5848.247668",
+        "id": "aaf46ed5.322dd",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].name`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 842.6666412353516,
-        "y": 369.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 854.6666412353516,
+        "y": 413.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "6bfa0dba.32b084",
-                "51d582d0.51e8dc",
-                "3cc10349.41b40c",
-                "3f7b410a.8138ce"
+                "870f2532.302988",
+                "c69b064d.42d558",
+                "360ea5f2.3aba6a",
+                "51becd83.b90354"
             ]
         ]
     },
     {
-        "id": "51d582d0.51e8dc",
+        "id": "c69b064d.42d558",
         "type": "outcome",
         "name": "sdnc_model_version",
         "xml": "<outcome value='sdnc_model_version'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083.6666412353516,
-        "y": 348.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 1095.6666412353516,
+        "y": 392.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "86fc17c4.fccda8"
+                "4c9f2347.0813ec"
             ]
         ]
     },
     {
-        "id": "3cc10349.41b40c",
+        "id": "360ea5f2.3aba6a",
         "type": "outcome",
         "name": "sdnc_artifact_name",
         "xml": "<outcome value='sdnc_artifact_name'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082.6666412353516,
-        "y": 397.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 1094.6666412353516,
+        "y": 441.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "259cc042.9d044"
+                "b1d9cd42.816"
             ]
         ]
     },
     {
-        "id": "86fc17c4.fccda8",
+        "id": "4c9f2347.0813ec",
         "type": "set",
         "name": "set tmp.sdnc-model-version",
-        "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n\n",
+        "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n",
         "comments": "",
-        "x": 1338.6666412353516,
-        "y": 348.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 1350.6666412353516,
+        "y": 392.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "259cc042.9d044",
+        "id": "b1d9cd42.816",
         "type": "set",
         "name": "set tmp.sdnc-artifact-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n\n",
         "comments": "",
-        "x": 1334.6666412353516,
-        "y": 397.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 1346.6666412353516,
+        "y": 441.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "11646aa2.a63495",
+        "id": "44b0c539.9ab1fc",
         "type": "set",
         "name": "set name-value other JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].name + '&quot;:&quot;' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n",
+        "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].name + '&quot;:&quot;' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n",
         "comments": "",
-        "x": 1251.916648864746,
-        "y": 448.83335041999817,
-        "z": "b3572fdc.57a7c",
+        "x": 1263.916648864746,
+        "y": 492.83335041999817,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "3f7b410a.8138ce",
+        "id": "51becd83.b90354",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1042.666648864746,
-        "y": 446.9047546386719,
-        "z": "b3572fdc.57a7c",
+        "x": 1054.666648864746,
+        "y": 490.9047546386719,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "11646aa2.a63495"
+                "44b0c539.9ab1fc"
             ]
         ]
     },
     {
-        "id": "937d5326.69965",
+        "id": "11ca6e3a.745ed2",
         "type": "set",
         "name": "set configAssignment JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $pnf-topology-operation-input.service-information.service-instance-id   + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;pnf-model-customization-uuid&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;pnf-id&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.pnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $pnf-topology-operation-input.pnf-request-input.aic-cloud-region + '&quot;'`\"/>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />",
+        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $pnf-topology-operation-input.service-information.service-instance-id   + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;pnf-model-customization-uuid&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;pnf-id&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.pnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $pnf-topology-operation-input.pnf-request-input.aic-cloud-region + '&quot;'`\"/>\n",
         "comments": "",
-        "x": 455.66664123535156,
-        "y": 689.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 478.6666564941406,
+        "y": 682.3333568572998,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "e221b302.f0199",
+        "id": "3087bf64.dce3e",
         "type": "execute",
         "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>\n <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\n <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\n <parameter name='action' value='`$action-name`' />\n <parameter name='mode' value='sync' />\n <parameter name='force' value='false' />\n <parameter name='ttl' value='0' />\n <parameter name='prefix' value='`$responsePrefix`' />\n <parameter name='payload' value=\"`'{\n  &quot;resource-assignment-request&quot;: {\n    &quot;template-prefix&quot;: [\n      &quot;' + $tmp.sdnc-artifact-name + '&quot;\n    ],\n    &quot;resource-assignment-properties&quot;: \n        ' + $tmp.json-payload + '\n  }\n}'`\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 463.33331298828125,
-        "y": 844,
-        "z": "b3572fdc.57a7c",
+        "x": 475.33331298828125,
+        "y": 888,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "ca21c8f3.691628",
-                "1cca5644.52e2da"
+                "d361485e.79ff28",
+                "8b7ec47b.a1ed38"
             ]
         ]
     },
     {
-        "id": "ca21c8f3.691628",
+        "id": "d361485e.79ff28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 703.3333129882812,
-        "y": 818,
-        "z": "b3572fdc.57a7c",
+        "x": 715.3333129882812,
+        "y": 862,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "cbb84843.6aa378"
+                "f00d65b.058a198"
             ]
         ]
     },
     {
-        "id": "cbb84843.6aa378",
+        "id": "f00d65b.058a198",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from BlueprintProcessingClient\" />\n",
         "comments": "",
-        "x": 885.3333129882812,
-        "y": 839,
-        "z": "b3572fdc.57a7c",
+        "x": 897.3333129882812,
+        "y": 883,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "2ad3fcee.93df44",
+        "id": "83f9cf68.29fa4",
         "type": "for",
         "name": "for resource-accumulator-resolved-data loop",
         "xml": "<for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 487.66664123535156,
-        "y": 1061.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 499.66664123535156,
+        "y": 1105.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "2c3ea9bb.7f7946"
+                "326b7e58.3b8352"
             ]
         ]
     },
     {
-        "id": "9d41528b.93ca8",
+        "id": "b2f73366.8118d",
         "type": "set",
         "name": "set from resource-accumulator-resolved-data",
         "xml": "<set>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n",
         "comments": "",
-        "x": 1717.6666412353516,
-        "y": 1113.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1729.6666412353516,
+        "y": 1157.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "3461757d.afec6a",
+        "id": "59d259e0.595458",
         "type": "for",
         "name": "for capability-data",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 412.66664123535156,
-        "y": 1403.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 424.66664123535156,
+        "y": 1447.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "d627a27f.2cb5b"
+                "abe63410.577b08"
             ]
         ]
     },
     {
-        "id": "d627a27f.2cb5b",
+        "id": "abe63410.577b08",
         "type": "for",
         "name": "for key-mapping",
         "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 621.6666412353516,
-        "y": 1403.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 633.6666412353516,
+        "y": 1447.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "216ffe0c.205142"
+                "22c99553.60eefa"
             ]
         ]
     },
     {
-        "id": "864aa7c9.1f7118",
+        "id": "3cae11e4.851bfe",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 431.66664123535156,
-        "y": 982.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 443.66664123535156,
+        "y": 1026.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d7f791b.bbebb7",
+        "id": "ded0fa5f.1cc958",
         "type": "execute",
         "name": "execute generateUUID",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.pnf-se-serv-uuid\" /> \n ",
         "comments": "",
         "outputs": 1,
-        "x": 437.66664123535156,
-        "y": 133.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 449.66664123535156,
+        "y": 177.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "760c8db3.569a74"
+                "18c0cf9e.15786"
             ]
         ]
     },
     {
-        "id": "760c8db3.569a74",
+        "id": "18c0cf9e.15786",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 615.6666412353516,
-        "y": 131.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 627.6666412353516,
+        "y": 175.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "7161cbe8.334ea4"
+                "3e720596.bd100a"
             ]
         ]
     },
     {
-        "id": "7161cbe8.334ea4",
+        "id": "3e720596.bd100a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n",
         "comments": "",
-        "x": 762.6666412353516,
-        "y": 132.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 774.6666412353516,
+        "y": 176.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "3ddac87b.4f3da8",
+        "id": "44191ec0.ea1e9",
         "type": "for",
         "name": "for pnf-parameters-data.param[]",
         "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1460.6666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1472.6666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "20ea2728.c6c858"
+                "9c0ff949.cfd6d8"
             ]
         ]
     },
     {
-        "id": "2c3ea9bb.7f7946",
+        "id": "326b7e58.3b8352",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 766.6666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 778.6666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "c9a47a5b.74ce78",
-                "704f5605.ef2be8",
-                "e738ca50.9bb188"
+                "2e3037b5.bead58",
+                "af1ab131.f6b7a",
+                "319ebff5.0b18b"
             ]
         ]
     },
     {
-        "id": "dfab7c99.217af",
+        "id": "e804e40a.3348d8",
         "type": "switchNode",
         "name": "switch pnf-parameters-data.param_length",
         "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 489.66664123535156,
-        "y": 231.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 501.66664123535156,
+        "y": 275.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "6b291f06.ba442",
-                "d14aa673.b0f938"
+                "3011eef2.7f3872",
+                "abb635bf.35df38"
             ]
         ]
     },
     {
-        "id": "6b291f06.ba442",
+        "id": "3011eef2.7f3872",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 727.6666412353516,
-        "y": 199.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 739.6666412353516,
+        "y": 243.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "c7a81447.af0e28"
+                "a428765d.4325f8"
             ]
         ]
     },
     {
-        "id": "d14aa673.b0f938",
+        "id": "abb635bf.35df38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 726.6666412353516,
-        "y": 263.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 738.6666412353516,
+        "y": 307.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "8406cee0.8a168"
+                "a82baf5c.81017"
             ]
         ]
     },
     {
-        "id": "c7a81447.af0e28",
+        "id": "a428765d.4325f8",
         "type": "set",
         "name": "set pre service param len as 0",
         "xml": "<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n",
         "comments": "",
-        "x": 940.6666412353516,
-        "y": 199.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 952.6666412353516,
+        "y": 243.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "8406cee0.8a168",
+        "id": "a82baf5c.81017",
         "type": "set",
         "name": "set pre service param len",
         "xml": "<set>\n   <parameter name='highnum' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' />",
         "comments": "",
-        "x": 925.6666412353516,
-        "y": 263.3333339691162,
-        "z": "b3572fdc.57a7c",
+        "x": 937.6666412353516,
+        "y": 307.3333339691162,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "20ea2728.c6c858",
+        "id": "9c0ff949.cfd6d8",
         "type": "switchNode",
         "name": "switch param[].name - input vs. jsonContextPrefix",
         "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1839.6666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1851.6666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "1f97b8fe.14f627"
+                "3d278d5e.539d72"
             ]
         ]
     },
     {
-        "id": "1f97b8fe.14f627",
+        "id": "3d278d5e.539d72",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2123.6666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 2135.6666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "cfd1df65.8c421"
+                "780e9758.f7fea8"
             ]
         ]
     },
     {
-        "id": "cfd1df65.8c421",
+        "id": "780e9758.f7fea8",
         "type": "set",
         "name": "set for existing param name",
         "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n",
         "comments": "",
-        "x": 2333.6666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 2345.6666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "e738ca50.9bb188",
+        "id": "319ebff5.0b18b",
         "type": "switchNode",
         "name": "switch tmp.mso.param.found",
         "xml": "<switch test='`$tmp.mso.param.found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1008.6666412353516,
-        "y": 1114.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1020.6666412353516,
+        "y": 1158.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "5d54064f.f0a378"
+                "51c6e9e.96e2e18"
             ]
         ]
     },
     {
-        "id": "5d54064f.f0a378",
+        "id": "51c6e9e.96e2e18",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1242.6666412353516,
-        "y": 1113.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1254.6666412353516,
+        "y": 1157.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "91cea0a0.32463"
+                "8a90fcb6.f7a9d"
             ]
         ]
     },
     {
-        "id": "c9a47a5b.74ce78",
+        "id": "2e3037b5.bead58",
         "type": "set",
         "name": "set for existing param name",
         "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n",
         "comments": "",
-        "x": 990.1666412353516,
-        "y": 1000.8333282470703,
-        "z": "b3572fdc.57a7c",
+        "x": 1002.1666412353516,
+        "y": 1044.8333282470703,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "704f5605.ef2be8",
+        "id": "af1ab131.f6b7a",
         "type": "switchNode",
         "name": "switch check length > 0",
         "xml": "<switch test='`$prehighnum &gt; 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 985.1666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 997.1666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "82f274ba.e58e48"
+                "a1472e40.a778d"
             ]
         ]
     },
     {
-        "id": "82f274ba.e58e48",
+        "id": "a1472e40.a778d",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1232.1666412353516,
-        "y": 1062.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1244.1666412353516,
+        "y": 1106.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "3ddac87b.4f3da8"
+                "44191ec0.ea1e9"
             ]
         ]
     },
     {
-        "id": "c2b9329e.7b7fe",
+        "id": "14c96642.2bd2ba",
         "type": "for",
         "name": "for payload",
         "xml": "<for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1803.6666412353516,
-        "y": 1421.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1815.6666412353516,
+        "y": 1465.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "1973b2f9.8576bd"
+                "75923618.437e88"
             ]
         ]
     },
     {
-        "id": "9263a471.304a78",
+        "id": "8660981d.5c4d68",
         "type": "set",
         "name": "set resource-key",
         "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\n",
         "comments": "",
-        "x": 2152.6666412353516,
-        "y": 1357.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 2164.6666412353516,
+        "y": 1401.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "bdc6e9e5.246078",
+        "id": "d0968145.fc2fe",
         "type": "set",
         "name": "set output-data ",
         "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />",
         "comments": "",
-        "x": 1376.6666412353516,
-        "y": 1301.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1388.6666412353516,
+        "y": 1345.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "216ffe0c.205142",
+        "id": "22c99553.60eefa",
         "type": "for",
         "name": "for output-key-mapping",
         "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 844.6666412353516,
-        "y": 1403.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 856.6666412353516,
+        "y": 1447.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "d332f89d.5d7ed8"
+                "dc9f6311.0ad25"
             ]
         ]
     },
     {
-        "id": "d332f89d.5d7ed8",
+        "id": "dc9f6311.0ad25",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1095.6666412353516,
-        "y": 1403.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1107.6666412353516,
+        "y": 1447.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "bdc6e9e5.246078",
-                "9a22b4d.28af748",
-                "14d775fb.50189a",
-                "d1982b17.6b7748"
+                "d0968145.fc2fe",
+                "aa6c039b.482f3",
+                "90cc12a2.1a5b1",
+                "d40d407c.44133"
             ]
         ]
     },
     {
-        "id": "9a22b4d.28af748",
+        "id": "aa6c039b.482f3",
         "type": "set",
         "name": "set length",
         "xml": "<set>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' value='`$highnum + 1`'/>\n",
         "comments": "",
-        "x": 1364.6666412353516,
-        "y": 1439.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1376.6666412353516,
+        "y": 1483.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "1cca5644.52e2da",
+        "id": "8b7ec47b.a1ed38",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 708.3333129882812,
-        "y": 880,
-        "z": "b3572fdc.57a7c",
+        "x": 720.3333129882812,
+        "y": 924,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "cbb84843.6aa378"
+                "f00d65b.058a198"
             ]
         ]
     },
     {
-        "id": "14d775fb.50189a",
+        "id": "90cc12a2.1a5b1",
         "type": "switchNode",
         "name": "switch payload_length",
         "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1400.6666412353516,
-        "y": 1372.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1412.6666412353516,
+        "y": 1416.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "abcb7f77.07548",
-                "2376e062.61cda"
+                "666568c4.95c698",
+                "c52ff329.5425"
             ]
         ]
     },
     {
-        "id": "abcb7f77.07548",
+        "id": "666568c4.95c698",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>",
         "comments": "",
         "outputs": 1,
-        "x": 1621.6666412353516,
-        "y": 1303.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1633.6666412353516,
+        "y": 1347.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             []
         ]
     },
     {
-        "id": "2376e062.61cda",
+        "id": "c52ff329.5425",
         "type": "other",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1628.6666412353516,
-        "y": 1421.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1640.6666412353516,
+        "y": 1465.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "c2b9329e.7b7fe"
+                "14c96642.2bd2ba"
             ]
         ]
     },
     {
-        "id": "8b4b4f46.8310f",
+        "id": "c4b3e20a.976c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171.9523658752441,
-        "y": 618.9046821594238,
-        "z": "b3572fdc.57a7c",
+        "x": 1183.9523658752441,
+        "y": 662.9046821594238,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "d8999389.3a4ec"
+                "c69ac6a5.a782c8"
             ]
         ]
     },
     {
-        "id": "6b7f75ff.e599ec",
+        "id": "f3c41dd.4705be",
         "type": "set",
         "name": "set length",
         "xml": "<set>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n",
         "comments": "",
-        "x": 2141.6666412353516,
-        "y": 1421.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 2153.6666412353516,
+        "y": 1465.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "adccc85e.eca3a8",
+        "id": "a26d3950.c7a1e8",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n",
         "comments": "",
-        "x": 2159.6666412353516,
-        "y": 1495.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 2171.6666412353516,
+        "y": 1539.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "d1982b17.6b7748",
+        "id": "d40d407c.44133",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n\n",
         "comments": "",
-        "x": 1385.6666412353516,
-        "y": 1506.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1397.6666412353516,
+        "y": 1550.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "91cea0a0.32463",
+        "id": "8a90fcb6.f7a9d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1419.6666412353516,
-        "y": 1112.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1431.6666412353516,
+        "y": 1156.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "9d41528b.93ca8",
-                "2b6854a1.91680c"
+                "b2f73366.8118d",
+                "e0efad2.feb625"
             ]
         ]
     },
     {
-        "id": "2b6854a1.91680c",
+        "id": "e0efad2.feb625",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
         "comments": "",
-        "x": 1634.6666412353516,
-        "y": 1172.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1646.6666412353516,
+        "y": 1216.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "1973b2f9.8576bd",
+        "id": "75923618.437e88",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1959.6666412353516,
-        "y": 1422.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 1971.6666412353516,
+        "y": 1466.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             [
-                "9263a471.304a78",
-                "6b7f75ff.e599ec",
-                "adccc85e.eca3a8"
+                "8660981d.5c4d68",
+                "f3c41dd.4705be",
+                "a26d3950.c7a1e8"
             ]
         ]
     },
     {
-        "id": "b7b3409c.b7131",
+        "id": "7696cfe3.25742",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 385.9999809265137,
-        "y": 765.333324432373,
-        "z": "b3572fdc.57a7c",
+        "x": 397.9999809265137,
+        "y": 809.333324432373,
+        "z": "cfe922a8.7a91",
         "wires": [
             []
         ]
     },
     {
-        "id": "cb318b66.0796c8",
+        "id": "906be4e1.f2f3b8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 382.6666488647461,
-        "y": 920.3333320617676,
-        "z": "b3572fdc.57a7c",
+        "x": 394.6666488647461,
+        "y": 964.3333320617676,
+        "z": "cfe922a8.7a91",
         "wires": [
             []
         ]
     },
     {
-        "id": "94bf3501.be3848",
+        "id": "7eebfe0.8659a04",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 391.00000762939453,
-        "y": 1724.5000267028809,
-        "z": "b3572fdc.57a7c",
+        "x": 403.00000762939453,
+        "y": 1768.5000267028809,
+        "z": "cfe922a8.7a91",
         "wires": [
             []
         ]
     },
     {
-        "id": "3d6976b6.27f80a",
+        "id": "59d1a840.b9e3b8",
         "type": "set",
         "name": "set pathname",
         "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-pnf-ra-assignment-' + \n\t$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.pnf-id + '.log'`\" />\n",
         "comments": "",
-        "x": 397.25000762939453,
-        "y": 1672.0000247955322,
-        "z": "b3572fdc.57a7c",
+        "x": 409.25000762939453,
+        "y": 1716.0000247955322,
+        "z": "cfe922a8.7a91",
         "wires": []
     },
     {
-        "id": "a566a00c.4994a",
+        "id": "9f59e925.e7ed18",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: pnf-ra-assignment\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 374.75000381469727,
-        "y": 1625.7500247955322,
-        "z": "b3572fdc.57a7c",
+        "x": 386.75000381469727,
+        "y": 1669.7500247955322,
+        "z": "cfe922a8.7a91",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "c4d5f704.d66b18",
+        "type": "set",
+        "name": "set updateJsonPayload",
+        "xml": "<set>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n<parameter name=\"`$cds + 'payload.template-prefix'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />",
+        "comments": "",
+        "x": 451.00003814697266,
+        "y": 732.3333587646484,
+        "z": "cfe922a8.7a91",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
index 9f86a0e4..74bd7b78 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "62b4ac2.a95e9d4",
+        "id": "eef285aa.adcf08",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 103,
-        "y": 69,
-        "z": "25457e3a.564dda",
+        "x": 112,
+        "y": 56,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "391f2cc4.ebd754"
+                "7fa82770.3d11a8"
             ]
         ]
     },
     {
-        "id": "391f2cc4.ebd754",
+        "id": "7fa82770.3d11a8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1152 +22,1164 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 379,
-        "y": 70,
-        "z": "25457e3a.564dda",
+        "x": 388,
+        "y": 57,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "90a983eb.65fd9"
+                "4815508b.fe2d3"
             ]
         ]
     },
     {
-        "id": "90a983eb.65fd9",
+        "id": "4815508b.fe2d3",
         "type": "method",
         "name": "self-serve-vfmodule-ra-assignment",
         "xml": "<method rpc='self-serve-vfmodule-ra-assignment' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 730,
-        "y": 70,
-        "z": "25457e3a.564dda",
+        "x": 739,
+        "y": 57,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "f81932d4.e701e"
+                "8883fb88.18b918"
             ]
         ]
     },
     {
-        "id": "f81932d4.e701e",
+        "id": "8883fb88.18b918",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 115.5,
-        "y": 152,
-        "z": "25457e3a.564dda",
+        "x": 124.5,
+        "y": 139,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "15b6f898.c038a7",
-                "75ce745c.c90274",
-                "2178fdaa.9f4722",
-                "41638aa2.6a574c",
-                "7f7fcb9e.5c0444",
-                "eb354f8e.b9f91",
-                "b3fed148.ab4d6",
-                "82beaa2.c0b24d8",
-                "5224ef9f.f95998",
-                "f02efea4.67e1a8",
-                "fc28f089.d04e38",
-                "a7a9673d.8c8648",
-                "6f10c8a6.d01ab",
-                "f4313dca.a2ef98",
-                "6ddd33ca.15d1fc"
+                "b71ab664.30d0b8",
+                "664b49d9.a8ed68",
+                "b69a7caa.2ef72",
+                "fd0f0fe.b870bf",
+                "4556977.80dab68",
+                "f4d2dad9.651818",
+                "c1dc247a.f59bd8",
+                "1584a1f4.77616e",
+                "d7fdb480.d92b28",
+                "34d4733f.ad277c",
+                "1f798081.68b1ef",
+                "860049fc.959878",
+                "53829451.b6abdc",
+                "f39abee0.7b55a",
+                "5ee34dfd.0df884",
+                "a487406b.42d53"
             ]
         ]
     },
     {
-        "id": "75ce745c.c90274",
+        "id": "664b49d9.a8ed68",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n   <parameter name=\"request-id\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-type`\" />  \n   <parameter name=\"resource-id\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />   \n   <parameter name=\"action-name\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n",
+        "xml": "<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>\n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n",
         "comments": "",
-        "x": 300,
-        "y": 198,
-        "z": "25457e3a.564dda",
+        "x": 309,
+        "y": 185,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "730e137.b92b2ec",
+        "id": "f8be6bf3.459048",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>",
         "comments": "",
         "outputs": 1,
-        "x": 576.2142486572266,
-        "y": 550.4642963409424,
-        "z": "25457e3a.564dda",
+        "x": 585.2142486572266,
+        "y": 537.4642963409424,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "69655b75.0e578c"
+                "70a816d3.209488"
             ]
         ]
     },
     {
-        "id": "41638aa2.6a574c",
+        "id": "fd0f0fe.b870bf",
         "type": "for",
         "name": "for vf-module-topology-operation-input",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 399.71431732177734,
-        "y": 415.7143135070801,
-        "z": "25457e3a.564dda",
+        "x": 408.71431732177734,
+        "y": 402.7143135070801,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "f207181d.dc00e8"
+                "43cc66c7.9e4908"
             ]
         ]
     },
     {
-        "id": "984d45d2.2050e8",
+        "id": "48b337df.0e22f8",
         "type": "set",
         "name": "set tmp.sdnc-model-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n",
         "comments": "",
-        "x": 1146.428565979004,
-        "y": 348.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 1155.428565979004,
+        "y": 335.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "a40d4738.46ee6",
+        "id": "31ed0071.fe8b9",
         "type": "outcome",
         "name": "sdnc_model_name",
         "xml": "<outcome value='sdnc_model_name'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 892.4285659790039,
-        "y": 348.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 901.4285659790039,
+        "y": 335.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "984d45d2.2050e8"
+                "48b337df.0e22f8"
             ]
         ]
     },
     {
-        "id": "f207181d.dc00e8",
+        "id": "43cc66c7.9e4908",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 654.4285659790039,
-        "y": 415.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 663.4285659790039,
+        "y": 402.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "a40d4738.46ee6",
-                "6b0ee766.140a",
-                "88e9a62a.e66e",
-                "21483ce9.b05d14"
+                "31ed0071.fe8b9",
+                "44279893.74a9d8",
+                "67bd2926.b30418",
+                "a154fcf0.3dc44"
             ]
         ]
     },
     {
-        "id": "6b0ee766.140a",
+        "id": "44279893.74a9d8",
         "type": "outcome",
         "name": "sdnc_model_version",
         "xml": "<outcome value='sdnc_model_version'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 895.4285659790039,
-        "y": 394.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 904.4285659790039,
+        "y": 381.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "88addd0a.9ca868"
+                "cf17488c.4f8388"
             ]
         ]
     },
     {
-        "id": "88e9a62a.e66e",
+        "id": "67bd2926.b30418",
         "type": "outcome",
         "name": "vf_module_label",
         "xml": "<outcome value='vf_module_label'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 880.4285659790039,
-        "y": 443.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 889.4285659790039,
+        "y": 430.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "b46339a.f490748"
+                "c0c56190.d3b15"
             ]
         ]
     },
     {
-        "id": "88addd0a.9ca868",
+        "id": "cf17488c.4f8388",
         "type": "set",
         "name": "set tmp.sdnc-model-version",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n",
         "comments": "",
-        "x": 1150.428565979004,
-        "y": 394.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 1159.428565979004,
+        "y": 381.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "b46339a.f490748",
+        "id": "c0c56190.d3b15",
         "type": "set",
         "name": "set tmp.vf-module-label",
         "xml": "<set>\n<parameter name='tmp.vf-module-label' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n",
         "comments": "",
-        "x": 1132.428565979004,
-        "y": 443.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 1141.428565979004,
+        "y": 430.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "7a186b3.6673414",
+        "id": "e897fa08.d5bf28",
         "type": "set",
         "name": "set name-value other JsonString",
         "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name + '&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n",
         "comments": "",
-        "x": 1150.428565979004,
-        "y": 494.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 1159.428565979004,
+        "y": 481.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "21483ce9.b05d14",
+        "id": "a154fcf0.3dc44",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 852.4285659790039,
-        "y": 494.1428813934326,
-        "z": "25457e3a.564dda",
+        "x": 861.4285659790039,
+        "y": 481.1428813934326,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "7a186b3.6673414"
+                "e897fa08.d5bf28"
             ]
         ]
     },
     {
-        "id": "7f7fcb9e.5c0444",
+        "id": "4556977.80dab68",
         "type": "set",
         "name": "set configAssignment JsonString",
-        "xml": "<set>\n\t<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload91\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n\t\n",
+        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`\"/>",
         "comments": "",
-        "x": 371,
-        "y": 708,
-        "z": "25457e3a.564dda",
+        "x": 395.0000190734863,
+        "y": 651,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "eb354f8e.b9f91",
+        "id": "f4d2dad9.651818",
         "type": "execute",
         "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest' >\n     <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\n     <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\n     <parameter name='action' value='`$action-name`' />\n     <parameter name='mode' value='sync' />\n     <parameter name='force' value='false' />\n     <parameter name='ttl' value='0' />\n     <parameter name='prefix' value='`$responsePrefix`' />\n     <parameter name='payload' value=\"`'{\n  &quot;resource-assignment-request&quot;: {\n    &quot;template-prefix&quot;: [\n      &quot;' + $tmp.vf-module-label + '&quot;\n    ],\n    &quot;resource-assignment-properties&quot;: \n        ' + $tmp.config-name-value-payload91 + '\n  }\n}'`\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 385.33331298828125,
-        "y": 885,
-        "z": "25457e3a.564dda",
+        "x": 397.3333435058594,
+        "y": 869.000057220459,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "5c78e84c.ba8ec",
-                "27108109.bca146"
+                "8233e320.47afe",
+                "6398d565.0d7bec"
             ]
         ]
     },
     {
-        "id": "5c78e84c.ba8ec",
+        "id": "8233e320.47afe",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 609.3333129882812,
-        "y": 851,
-        "z": "25457e3a.564dda",
+        "x": 618.3333129882812,
+        "y": 838,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "37ca0be9.afa37c"
+                "ad5923cd.d6bbb"
             ]
         ]
     },
     {
-        "id": "37ca0be9.afa37c",
+        "id": "ad5923cd.d6bbb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from ConfigAssignmentNode\" />\n",
         "comments": "",
-        "x": 807.3333129882812,
-        "y": 851,
-        "z": "25457e3a.564dda",
+        "x": 816.3333129882812,
+        "y": 838,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "82beaa2.c0b24d8",
+        "id": "1584a1f4.77616e",
         "type": "for",
         "name": "for resource-accumulator-resolved-data loop",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 418.00001525878906,
-        "y": 1153.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 427.00001525878906,
+        "y": 1140.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "371f7985.57bd16"
+                "a0dff41d.c5f6f8"
             ]
         ]
     },
     {
-        "id": "ea488b64.0cb308",
+        "id": "b1915485.d1a248",
         "type": "set",
         "name": "set from resource-accumulator-resolved-data",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n\n",
         "comments": "",
-        "x": 1632.000015258789,
-        "y": 1204.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1641.000015258789,
+        "y": 1191.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "5224ef9f.f95998",
+        "id": "d7fdb480.d92b28",
         "type": "for",
         "name": "for capability-data",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 337.00001525878906,
-        "y": 1416.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 346.00001525878906,
+        "y": 1403.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "180834f4.0223fb"
+                "57177866.272cc8"
             ]
         ]
     },
     {
-        "id": "180834f4.0223fb",
+        "id": "57177866.272cc8",
         "type": "for",
         "name": "for key-mapping",
         "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 560.0000152587891,
-        "y": 1416.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 569.0000152587891,
+        "y": 1403.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "90054e48.e44a1"
+                "c093b4a1.367fc8"
             ]
         ]
     },
     {
-        "id": "b3fed148.ab4d6",
+        "id": "c1dc247a.f59bd8",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 362.00001525878906,
-        "y": 1074.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 371.00001525878906,
+        "y": 1061.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             []
         ]
     },
     {
-        "id": "15b6f898.c038a7",
+        "id": "b71ab664.30d0b8",
         "type": "execute",
         "name": "execute generateUUID",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ",
         "comments": "",
         "outputs": 1,
-        "x": 345,
-        "y": 152,
-        "z": "25457e3a.564dda",
+        "x": 354,
+        "y": 139,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "7e9fde22.d0f5"
+                "f5981e01.60fd2"
             ]
         ]
     },
     {
-        "id": "7e9fde22.d0f5",
+        "id": "f5981e01.60fd2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550,
-        "y": 152,
-        "z": "25457e3a.564dda",
+        "x": 559,
+        "y": 139,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "1e729d78.2afb63"
+                "3c5c1bf8.51e694"
             ]
         ]
     },
     {
-        "id": "1e729d78.2afb63",
+        "id": "3c5c1bf8.51e694",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n",
         "comments": "",
-        "x": 714,
-        "y": 151,
-        "z": "25457e3a.564dda",
+        "x": 723,
+        "y": 138,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "921c6908.5a7c6",
+        "id": "cde17ef3.62e96",
         "type": "for",
         "name": "for vnf-parameters-data.param",
         "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1391.000015258789,
-        "y": 1153.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1400.000015258789,
+        "y": 1140.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "4ba8e978.428598"
+                "ee7f99cb.ec6478"
             ]
         ]
     },
     {
-        "id": "371f7985.57bd16",
+        "id": "a0dff41d.c5f6f8",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 697.0000152587891,
-        "y": 1154.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 706.0000152587891,
+        "y": 1141.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "daec1228.174c78",
-                "11c1115b.0b9dcf",
-                "b6fa1afb.0b0068"
+                "5ba2a252.918fcc",
+                "9de1e4b8.140328",
+                "8d20aa37.3155b8"
             ]
         ]
     },
     {
-        "id": "2178fdaa.9f4722",
+        "id": "b69a7caa.2ef72",
         "type": "switchNode",
         "name": "switch vf-parameters-data.param_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 417,
-        "y": 253,
-        "z": "25457e3a.564dda",
+        "x": 426,
+        "y": 240,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "2f8ba0ac.8cb83",
-                "585f5e92.feaf28"
+                "4afc6166.7a666",
+                "82ad191e.542718"
             ]
         ]
     },
     {
-        "id": "2f8ba0ac.8cb83",
+        "id": "4afc6166.7a666",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 680.1428833007812,
-        "y": 220.85715293884277,
-        "z": "25457e3a.564dda",
+        "x": 689.1428833007812,
+        "y": 207.85715293884277,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "95452a78.4cd6e8"
+                "efd0848b.dde0a8"
             ]
         ]
     },
     {
-        "id": "585f5e92.feaf28",
+        "id": "82ad191e.542718",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 679.1428833007812,
-        "y": 284.8571529388428,
-        "z": "25457e3a.564dda",
+        "x": 688.1428833007812,
+        "y": 271.8571529388428,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "274ba7d4.2752e"
+                "f848b2f3.3c79"
             ]
         ]
     },
     {
-        "id": "95452a78.4cd6e8",
+        "id": "efd0848b.dde0a8",
         "type": "set",
         "name": "set pre service param len as 0",
         "xml": "<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n",
         "comments": "",
-        "x": 893.1428833007812,
-        "y": 220.85715293884277,
-        "z": "25457e3a.564dda",
+        "x": 902.1428833007812,
+        "y": 207.85715293884277,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "274ba7d4.2752e",
+        "id": "f848b2f3.3c79",
         "type": "set",
         "name": "set pre service param len",
         "xml": "<set>\n   <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' />",
         "comments": "",
-        "x": 878.1428833007812,
-        "y": 284.8571529388428,
-        "z": "25457e3a.564dda",
+        "x": 887.1428833007812,
+        "y": 271.8571529388428,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "4ba8e978.428598",
+        "id": "ee7f99cb.ec6478",
         "type": "switchNode",
         "name": "switch input vnf-name",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1649.000015258789,
-        "y": 1153.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1658.000015258789,
+        "y": 1140.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "51567492.7ec0ac"
+                "9cff4b27.b85b38"
             ]
         ]
     },
     {
-        "id": "51567492.7ec0ac",
+        "id": "9cff4b27.b85b38",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1829.000015258789,
-        "y": 1153.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1838.000015258789,
+        "y": 1140.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "c1a41bbc.f5855"
+                "c0fb05df.380d78"
             ]
         ]
     },
     {
-        "id": "c1a41bbc.f5855",
+        "id": "c0fb05df.380d78",
         "type": "set",
         "name": "set for existing param name",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n",
         "comments": "",
-        "x": 2039.000015258789,
-        "y": 1154.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 2048.000015258789,
+        "y": 1141.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "b6fa1afb.0b0068",
+        "id": "8d20aa37.3155b8",
         "type": "switchNode",
         "name": "switch tmp.mso.param.not-found",
         "xml": "<switch test='`$tmp.mso.param.found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 939.0000152587891,
-        "y": 1206.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 948.0000152587891,
+        "y": 1193.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "13042a91.1fbf7d"
+                "1c10cd2a.821413"
             ]
         ]
     },
     {
-        "id": "13042a91.1fbf7d",
+        "id": "1c10cd2a.821413",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1173.000015258789,
-        "y": 1205.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1182.000015258789,
+        "y": 1192.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "c99ccd6c.b70598"
+                "99896231.f8f2a"
             ]
         ]
     },
     {
-        "id": "daec1228.174c78",
+        "id": "5ba2a252.918fcc",
         "type": "set",
         "name": "set for existing param name",
         "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n",
         "comments": "",
-        "x": 923.0000152587891,
-        "y": 1095.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 932.0000152587891,
+        "y": 1082.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "11c1115b.0b9dcf",
+        "id": "9de1e4b8.140328",
         "type": "switchNode",
         "name": "switch check length > 0",
         "xml": "<switch test='`$prehighnum &gt; 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 915.5000152587891,
-        "y": 1154.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 924.5000152587891,
+        "y": 1141.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "13d6175.5719969"
+                "9213bfe0.b1c2f"
             ]
         ]
     },
     {
-        "id": "13d6175.5719969",
+        "id": "9213bfe0.b1c2f",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162.500015258789,
-        "y": 1154.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1171.500015258789,
+        "y": 1141.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "921c6908.5a7c6"
+                "cde17ef3.62e96"
             ]
         ]
     },
     {
-        "id": "402f5e16.17318",
+        "id": "2ccc2373.2f411c",
         "type": "for",
         "name": "for payload",
         "xml": "<for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1609.000015258789,
-        "y": 1468.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1618.000015258789,
+        "y": 1455.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "5766e1da.218b68"
+                "f1daaf1.ffce15"
             ]
         ]
     },
     {
-        "id": "462cc35.3e8b9bc",
+        "id": "44960d5c.3364a4",
         "type": "set",
         "name": "set resource-key",
         "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\t\n",
         "comments": "",
-        "x": 2008.000015258789,
-        "y": 1409.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 2017.000015258789,
+        "y": 1396.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "ae8db4d3.4b4a48",
+        "id": "53d49382.5b17ac",
         "type": "set",
         "name": "set output-data ",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />",
         "comments": "",
-        "x": 1187.000015258789,
-        "y": 1370.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1196.000015258789,
+        "y": 1357.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "90054e48.e44a1",
+        "id": "c093b4a1.367fc8",
         "type": "for",
         "name": "for output-key-mapping",
         "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 795.0000152587891,
-        "y": 1417.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 804.0000152587891,
+        "y": 1404.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "5a70cf94.1278d8"
+                "556a862d.ca6cc8"
             ]
         ]
     },
     {
-        "id": "5a70cf94.1278d8",
+        "id": "556a862d.ca6cc8",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 990.0000152587891,
-        "y": 1416.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 999.0000152587891,
+        "y": 1403.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "ae8db4d3.4b4a48",
-                "914a95fd.27e4",
-                "74ac5a29.666eac",
-                "5d5538e1.f0339"
+                "53d49382.5b17ac",
+                "d10a9ec.6fa016",
+                "1edc412b.57e08f",
+                "fb512106.96832"
             ]
         ]
     },
     {
-        "id": "74ac5a29.666eac",
+        "id": "1edc412b.57e08f",
         "type": "set",
         "name": "set length",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' value='`$highnum + 1`'/>\n\n",
         "comments": "",
-        "x": 1186.000015258789,
-        "y": 1468.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1195.000015258789,
+        "y": 1455.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "27108109.bca146",
+        "id": "6398d565.0d7bec",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 614.3333129882812,
-        "y": 913,
-        "z": "25457e3a.564dda",
+        "x": 623.3333129882812,
+        "y": 900,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "37ca0be9.afa37c"
+                "ad5923cd.d6bbb"
             ]
         ]
     },
     {
-        "id": "914a95fd.27e4",
+        "id": "d10a9ec.6fa016",
         "type": "switchNode",
         "name": "switch payload_length",
         "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1216.000015258789,
-        "y": 1417.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1225.000015258789,
+        "y": 1404.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "e7579cfd.79cf",
-                "53b912f8.bc8e44"
+                "4ee4b348.8656dc",
+                "e4f53748.a116e8"
             ]
         ]
     },
     {
-        "id": "e7579cfd.79cf",
+        "id": "4ee4b348.8656dc",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>",
         "comments": "",
         "outputs": 1,
-        "x": 1431.000015258789,
-        "y": 1349.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1440.000015258789,
+        "y": 1336.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             []
         ]
     },
     {
-        "id": "53b912f8.bc8e44",
+        "id": "e4f53748.a116e8",
         "type": "other",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1440.000015258789,
-        "y": 1468.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1449.000015258789,
+        "y": 1455.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "402f5e16.17318"
+                "2ccc2373.2f411c"
             ]
         ]
     },
     {
-        "id": "f02efea4.67e1a8",
+        "id": "34d4733f.ad277c",
         "type": "switchNode",
         "name": "switch: model info == NULL",
         "xml": "<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.vf-module-label == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 364.78570556640625,
-        "y": 550.6071863174438,
-        "z": "25457e3a.564dda",
+        "x": 373.78570556640625,
+        "y": 537.6071863174438,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "730e137.b92b2ec"
+                "f8be6bf3.459048"
             ]
         ]
     },
     {
-        "id": "210411fd.9339ae",
+        "id": "2dcbecbb.bef464",
         "type": "get-resource",
         "name": "get VF_MODEL.sdnc_model_name",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1042.9285354614258,
-        "y": 551.464297413826,
-        "z": "25457e3a.564dda",
+        "x": 1051.9285354614258,
+        "y": 538.464297413826,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "1dda43f0.78a6ec",
-                "17ee1b83.1900bc",
-                "436821fa.6b6638"
+                "6d48236.8c58cdc",
+                "77c0ba75.bf78b4",
+                "3eefac05.6098c4"
             ]
         ]
     },
     {
-        "id": "1dda43f0.78a6ec",
+        "id": "6d48236.8c58cdc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1286.1427536010742,
-        "y": 551.8451566696167,
-        "z": "25457e3a.564dda",
+        "x": 1295.1427536010742,
+        "y": 538.8451566696167,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "13103a3.51f8ec6"
+                "b60c82bc.a0482"
             ]
         ]
     },
     {
-        "id": "13103a3.51f8ec6",
+        "id": "b60c82bc.a0482",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",
         "comments": "",
-        "x": 1467.142734527588,
-        "y": 551.9880638122559,
-        "z": "25457e3a.564dda",
+        "x": 1476.142734527588,
+        "y": 538.9880638122559,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "dc45b20d.a2471",
+        "id": "691f618d.9d0b7",
         "type": "get-resource",
         "name": "get VF_MODULE_MODEL.vf-module-label",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT vf_module_label from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid \n  \tAND vf_module_label is not null'\n  pfx='db1.vf-module-model'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1064.380874633789,
-        "y": 680.3095798492432,
-        "z": "25457e3a.564dda",
+        "x": 1073.380874633789,
+        "y": 667.3095798492432,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "49f2443a.7a2f84",
-                "1553ab7a.9ccd2d",
-                "f60a2de7.b86a"
+                "7a3b7e53.0cbf9",
+                "21c1086d.e4f9e8",
+                "9b560159.d8c39"
             ]
         ]
     },
     {
-        "id": "49f2443a.7a2f84",
+        "id": "7a3b7e53.0cbf9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.1664581298828,
-        "y": 680.6904038190842,
-        "z": "25457e3a.564dda",
+        "x": 1352.1664581298828,
+        "y": 667.6904038190842,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "696c0378.dceeec"
+                "e1cb3e60.4c427"
             ]
         ]
     },
     {
-        "id": "696c0378.dceeec",
+        "id": "e1cb3e60.4c427",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
         "comments": "",
-        "x": 1518.166389465332,
-        "y": 680.8333042860031,
-        "z": "25457e3a.564dda",
+        "x": 1527.166389465332,
+        "y": 667.8333042860031,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "1553ab7a.9ccd2d",
+        "id": "21c1086d.e4f9e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1353.3808822631836,
-        "y": 760.095287322998,
-        "z": "25457e3a.564dda",
+        "x": 1362.3808822631836,
+        "y": 747.095287322998,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "2b1bf028.83d6c"
+                "3dd958.a42046a8"
             ]
         ]
     },
     {
-        "id": "69655b75.0e578c",
+        "id": "70a816d3.209488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 751.7380294799805,
-        "y": 550.8452922105789,
-        "z": "25457e3a.564dda",
+        "x": 760.7380294799805,
+        "y": 537.8452922105789,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "210411fd.9339ae",
-                "dc45b20d.a2471"
+                "2dcbecbb.bef464",
+                "691f618d.9d0b7"
             ]
         ]
     },
     {
-        "id": "e9acfce8.8fe6e",
+        "id": "e3b84927.6478a8",
         "type": "set",
         "name": "set sdnc-model-name, sdnc-model-version",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n\n\n\n",
         "comments": "",
-        "x": 1565.42866897583,
-        "y": 631.964334487915,
-        "z": "25457e3a.564dda",
+        "x": 1574.42866897583,
+        "y": 618.964334487915,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "17ee1b83.1900bc",
+        "id": "77c0ba75.bf78b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1294.0001411437988,
-        "y": 632.2500095367432,
-        "z": "25457e3a.564dda",
+        "x": 1303.0001411437988,
+        "y": 619.2500095367432,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "e9acfce8.8fe6e"
+                "e3b84927.6478a8"
             ]
         ]
     },
     {
-        "id": "2b1bf028.83d6c",
+        "id": "3dd958.a42046a8",
         "type": "set",
         "name": "set vf-module-label",
         "xml": "<set>\n<parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />\n\n\n\n",
         "comments": "",
-        "x": 1557.821434020996,
-        "y": 761.6786003112793,
-        "z": "25457e3a.564dda",
+        "x": 1566.821434020996,
+        "y": 748.6786003112793,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "5766e1da.218b68",
+        "id": "f1daaf1.ffce15",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1786.000015258789,
-        "y": 1467.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1795.000015258789,
+        "y": 1454.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "462cc35.3e8b9bc",
-                "8649e6f6.ce9d2",
-                "7fb45245.33dda4"
+                "44960d5c.3364a4",
+                "4b9e8979.c71658",
+                "bdf323e8.a11f4"
             ]
         ]
     },
     {
-        "id": "8649e6f6.ce9d2",
+        "id": "4b9e8979.c71658",
         "type": "set",
         "name": "set length",
         "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n",
         "comments": "",
-        "x": 1997.000015258789,
-        "y": 1467.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 2006.000015258789,
+        "y": 1454.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "436821fa.6b6638",
+        "id": "3eefac05.6098c4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1296.7500190734863,
-        "y": 591.5000076293945,
-        "z": "25457e3a.564dda",
+        "x": 1305.7500190734863,
+        "y": 578.5000076293945,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "37a1e85c.528b7"
+                "8019c4ec.975338"
             ]
         ]
     },
     {
-        "id": "37a1e85c.528b7",
+        "id": "8019c4ec.975338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No VF_MODEL found with customization_uuid = ' + $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />",
         "comments": "",
-        "x": 1468.0000228881836,
-        "y": 590.2500085830688,
-        "z": "25457e3a.564dda",
+        "x": 1477.0000228881836,
+        "y": 577.2500085830688,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "f60a2de7.b86a",
+        "id": "9b560159.d8c39",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1354.25,
-        "y": 721.5,
-        "z": "25457e3a.564dda",
+        "x": 1363.25,
+        "y": 708.5,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "94027915.4b59b"
+                "489b8367.0100dc"
             ]
         ]
     },
     {
-        "id": "94027915.4b59b",
+        "id": "489b8367.0100dc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'vf_module_label not found in VF_MODULE_MODEL WHERE customization_uuid = ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />",
         "comments": "",
-        "x": 1525.5000038146973,
-        "y": 720.2500009536743,
-        "z": "25457e3a.564dda",
+        "x": 1534.5000038146973,
+        "y": 707.2500009536743,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "7fb45245.33dda4",
+        "id": "bdf323e8.a11f4",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n",
         "comments": "",
-        "x": 2010.000015258789,
-        "y": 1533.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 2019.000015258789,
+        "y": 1520.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "5d5538e1.f0339",
+        "id": "fb512106.96832",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
         "comments": "",
-        "x": 1203.000015258789,
-        "y": 1539.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1212.000015258789,
+        "y": 1526.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "b8f5425b.1922c",
+        "id": "3d1f3402.e6765c",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
         "comments": "",
-        "x": 1550.000015258789,
-        "y": 1264.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1559.000015258789,
+        "y": 1251.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "c99ccd6c.b70598",
+        "id": "99896231.f8f2a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1344.000015258789,
-        "y": 1204.3333473205566,
-        "z": "25457e3a.564dda",
+        "x": 1353.000015258789,
+        "y": 1191.3333473205566,
+        "z": "37ca9f86.ffaea",
         "wires": [
             [
-                "ea488b64.0cb308",
-                "b8f5425b.1922c"
+                "b1915485.d1a248",
+                "3d1f3402.e6765c"
             ]
         ]
     },
     {
-        "id": "fc28f089.d04e38",
+        "id": "1f798081.68b1ef",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 309.6666603088379,
-        "y": 814.0000104904175,
-        "z": "25457e3a.564dda",
+        "x": 318.6666603088379,
+        "y": 801.0000104904175,
+        "z": "37ca9f86.ffaea",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7a9673d.8c8648",
+        "id": "860049fc.959878",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 306.3333282470703,
-        "y": 969.000018119812,
-        "z": "25457e3a.564dda",
+        "x": 315.3333282470703,
+        "y": 956.000018119812,
+        "z": "37ca9f86.ffaea",
         "wires": [
             []
         ]
     },
     {
-        "id": "f4313dca.a2ef98",
+        "id": "f39abee0.7b55a",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 319.25,
-        "y": 1691.5000133514404,
-        "z": "25457e3a.564dda",
+        "x": 328.25,
+        "y": 1678.5000133514404,
+        "z": "37ca9f86.ffaea",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f10c8a6.d01ab",
+        "id": "53829451.b6abdc",
         "type": "set",
         "name": "set pathname",
         "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vfmodule-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`\" />\n",
         "comments": "",
-        "x": 325.5,
-        "y": 1639.0000114440918,
-        "z": "25457e3a.564dda",
+        "x": 334.5,
+        "y": 1626.0000114440918,
+        "z": "37ca9f86.ffaea",
         "wires": []
     },
     {
-        "id": "6ddd33ca.15d1fc",
+        "id": "5ee34dfd.0df884",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: vfmodule-ra-assignment\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 304.00000381469727,
-        "y": 1590.2500190734863,
-        "z": "25457e3a.564dda",
+        "x": 313.00000381469727,
+        "y": 1577.2500190734863,
+        "z": "37ca9f86.ffaea",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "a487406b.42d53",
+        "type": "set",
+        "name": "set updateJsonPayload",
+        "xml": "<set>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n    <parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n    <parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n    <parameter name=\"`$cds + 'payload.template-prefix'`\" value='`$tmp.sdnc-artifact-name`' />\n    <parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />",
+        "comments": "",
+        "x": 369.0000228881836,
+        "y": 702.6667098999023,
+        "z": "37ca9f86.ffaea",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
index 97111877..0cf5a8da 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "f7510939.737a28",
+        "id": "1264c6cd.930839",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 97,
-        "y": 66,
-        "z": "58e8fb6f.65cbf4",
+        "x": 101,
+        "y": 96,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "2fcf1979.35372e"
+                "cd72f82b.448a88"
             ]
         ]
     },
     {
-        "id": "2fcf1979.35372e",
+        "id": "cd72f82b.448a88",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1053 +22,1065 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 373,
-        "y": 67,
-        "z": "58e8fb6f.65cbf4",
+        "x": 377,
+        "y": 97,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "bc76009d.4ebf28"
+                "1882c0cd.fac1af"
             ]
         ]
     },
     {
-        "id": "bc76009d.4ebf28",
+        "id": "1882c0cd.fac1af",
         "type": "method",
         "name": "self-serve-vnf-ra-assignment",
         "xml": "<method rpc='self-serve-vnf-ra-assignment' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 690,
-        "y": 67,
-        "z": "58e8fb6f.65cbf4",
+        "x": 694,
+        "y": 97,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "5a6abd1c.325a84"
+                "5be6105f.ccbde"
             ]
         ]
     },
     {
-        "id": "5a6abd1c.325a84",
+        "id": "5be6105f.ccbde",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 186.16664123535156,
-        "y": 147.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 190.16664123535156,
+        "y": 177.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "df3086f1.895f2",
-                "ea9193c.a6879f",
-                "33c58f5d.79c91",
-                "6787a8cd.55f73",
-                "a6a772e5.982a2",
-                "bd0c1c4e.597a5",
-                "91dde7fd.fe86a",
-                "a269720d.c1b3c",
-                "c497e61b.9d5da",
-                "5d2bdeb6.7712a",
-                "ff9121b8.95fe6",
-                "a656672e.be2f5",
-                "479d04c2.fc7acc",
-                "8048ec03.29272",
-                "c8325ee3.97b988"
+                "95e79859.795e68",
+                "9ad508ab.052518",
+                "3ac5cd34.2257f2",
+                "2edab5da.4808ea",
+                "f2aa029b.615de",
+                "10dc8417.707e0c",
+                "fd52ae4e.bd56c",
+                "c73b8162.24f6f",
+                "d29a4d92.8e7d9",
+                "84a90182.cf73",
+                "48b65c6e.618e44",
+                "80225cf4.2c8b2",
+                "a4083479.8e5dd8",
+                "638697ae.8d3678",
+                "2e936c1f.cb2bd4",
+                "546a230c.3e01dc"
             ]
         ]
     },
     {
-        "id": "ea9193c.a6879f",
+        "id": "9ad508ab.052518",
         "type": "set",
         "name": "set",
-        "xml": "<set>\n   <parameter name=\"request-id\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-type`\" />  \n   <parameter name=\"resource-id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />   \n   <parameter name=\"action-name\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n",
+        "xml": "<set>\n   <parameter name=\"cds\" value=\"execution-service_process.\"/>\n   <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n   <parameter name=\"resource-type\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-type`\" />  \n   <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />   \n   <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n   <parameter name=\"responsePrefix\" value=\"raAssign\" />\n   <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n   <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n   <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n",
         "comments": "",
-        "x": 371.9166603088379,
-        "y": 192.08333015441895,
-        "z": "58e8fb6f.65cbf4",
+        "x": 375.9166603088379,
+        "y": 222.08333015441895,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "6b11523.8f254ac",
+        "id": "877ede4f.92e9b",
         "type": "get-resource",
         "name": "get-resource VF_MODEL",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db1.vf-model'>\n  \n\n",
         "comments": "",
         "outputs": 1,
-        "x": 910.8094635009766,
-        "y": 583.6189861297607,
-        "z": "58e8fb6f.65cbf4",
+        "x": 914.8094635009766,
+        "y": 613.6189861297607,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "5877f735.e57fd",
-                "7ba78ada.2fb134",
-                "bf519ef3.d251"
+                "8947e8ba.8b6c18",
+                "7bc2b258.538c7c",
+                "c5829c3f.f44d7"
             ]
         ]
     },
     {
-        "id": "5877f735.e57fd",
+        "id": "8947e8ba.8b6c18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1155.8095626831055,
-        "y": 532.904709815979,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1159.8095626831055,
+        "y": 562.904709815979,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "f07c5725.aa61d"
+                "2b79a1d8.82461e"
             ]
         ]
     },
     {
-        "id": "f07c5725.aa61d",
+        "id": "2b79a1d8.82461e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
         "comments": "",
-        "x": 1328.8095626831055,
-        "y": 531.904709815979,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1332.8095626831055,
+        "y": 561.904709815979,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "fbb3efb4.020878",
+        "id": "9a929dee.aae27",
         "type": "set",
         "name": "set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n<parameter name='tmp.sdnc-artifact-name' value='`$db1.vf-model.sdnc-artifact-name`' />\n\n\n\n\n",
         "comments": "",
-        "x": 1531.2380638122559,
-        "y": 633.047513961792,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1535.2380638122559,
+        "y": 663.047513961792,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "7d77945b.b872dc",
+        "id": "1f983518.26a63b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
         "comments": "",
-        "x": 1330.8095626831055,
-        "y": 580.904709815979,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1334.8095626831055,
+        "y": 610.904709815979,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "a6a772e5.982a2",
+        "id": "f2aa029b.615de",
         "type": "switchNode",
         "name": "switch: model info == NULL",
         "xml": "<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.sdnc-artifact-name == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 431.80946350097656,
-        "y": 584.6189861297607,
-        "z": "58e8fb6f.65cbf4",
+        "x": 435.80946350097656,
+        "y": 614.6189861297607,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "45517119.0e4e48"
+                "a0598bd4.bb2518"
             ]
         ]
     },
     {
-        "id": "7ba78ada.2fb134",
+        "id": "7bc2b258.538c7c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1161.8095626831055,
-        "y": 581.904709815979,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1165.8095626831055,
+        "y": 611.904709815979,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "7d77945b.b872dc"
+                "1f983518.26a63b"
             ]
         ]
     },
     {
-        "id": "45517119.0e4e48",
+        "id": "a0598bd4.bb2518",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>",
         "comments": "",
         "outputs": 1,
-        "x": 680.8094635009766,
-        "y": 584.6189861297607,
-        "z": "58e8fb6f.65cbf4",
+        "x": 684.8094635009766,
+        "y": 614.6189861297607,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "6b11523.8f254ac"
+                "877ede4f.92e9b"
             ]
         ]
     },
     {
-        "id": "6787a8cd.55f73",
+        "id": "2edab5da.4808ea",
         "type": "for",
         "name": "for vnf-topology-operation-input",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 447.66664123535156,
-        "y": 384.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 451.66664123535156,
+        "y": 414.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "df930bd3.0b7718"
+                "8e542e02.8473f"
             ]
         ]
     },
     {
-        "id": "df930bd3.0b7718",
+        "id": "8e542e02.8473f",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 669.6666412353516,
-        "y": 383.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 673.6666412353516,
+        "y": 413.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "408427e4.b460e8"
+                "d470eb9a.687f98"
             ]
         ]
     },
     {
-        "id": "e049960d.9cd738",
+        "id": "fb20cb1a.51a4b8",
         "type": "set",
         "name": "set tmp.sdnc-model-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n",
         "comments": "",
-        "x": 1320.6666412353516,
-        "y": 316.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1324.6666412353516,
+        "y": 346.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "16a8e775.3a66e1",
+        "id": "7c80301e.7f871",
         "type": "outcome",
         "name": "sdnc_model_name",
         "xml": "<outcome value='sdnc_model_name'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.6666412353516,
-        "y": 316.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1070.6666412353516,
+        "y": 346.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "e049960d.9cd738"
+                "fb20cb1a.51a4b8"
             ]
         ]
     },
     {
-        "id": "408427e4.b460e8",
+        "id": "d470eb9a.687f98",
         "type": "switchNode",
         "name": "switch",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 828.6666412353516,
-        "y": 383.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 832.6666412353516,
+        "y": 413.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "16a8e775.3a66e1",
-                "6adfc9ab.cf61f",
-                "5d22c0ae.86e7a",
-                "45edf3cd.ba4db4"
+                "7c80301e.7f871",
+                "69dbd226.9264ec",
+                "87b3dbed.61a088",
+                "27ccfdc6.314a12"
             ]
         ]
     },
     {
-        "id": "6adfc9ab.cf61f",
+        "id": "69dbd226.9264ec",
         "type": "outcome",
         "name": "sdnc_model_version",
         "xml": "<outcome value='sdnc_model_version'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1069.6666412353516,
-        "y": 362.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1073.6666412353516,
+        "y": 392.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "591cbcf1.5fb17c"
+                "74fadd31.036b54"
             ]
         ]
     },
     {
-        "id": "5d22c0ae.86e7a",
+        "id": "87b3dbed.61a088",
         "type": "outcome",
         "name": "sdnc_artifact_name",
         "xml": "<outcome value='sdnc_artifact_name'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1068.6666412353516,
-        "y": 411.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1072.6666412353516,
+        "y": 441.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "122b59ca.cd367e"
+                "a7f5b067.57b29"
             ]
         ]
     },
     {
-        "id": "591cbcf1.5fb17c",
+        "id": "74fadd31.036b54",
         "type": "set",
         "name": "set tmp.sdnc-model-version",
         "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n",
         "comments": "",
-        "x": 1324.6666412353516,
-        "y": 362.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1328.6666412353516,
+        "y": 392.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "122b59ca.cd367e",
+        "id": "a7f5b067.57b29",
         "type": "set",
         "name": "set tmp.sdnc-artifact-name",
         "xml": "<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n",
         "comments": "",
-        "x": 1320.6666412353516,
-        "y": 411.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1324.6666412353516,
+        "y": 441.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "3f7c8176.d6b64e",
+        "id": "e803a56a.a7f258",
         "type": "set",
         "name": "set name-value other JsonString",
         "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + '&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n",
         "comments": "",
-        "x": 1336.6666412353516,
-        "y": 460.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1340.6666412353516,
+        "y": 490.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "45edf3cd.ba4db4",
+        "id": "27ccfdc6.314a12",
         "type": "outcome",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1028.666648864746,
-        "y": 460.9047546386719,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1032.666648864746,
+        "y": 490.9047546386719,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "3f7c8176.d6b64e"
+                "e803a56a.a7f258"
             ]
         ]
     },
     {
-        "id": "bd0c1c4e.597a5",
+        "id": "10dc8417.707e0c",
         "type": "set",
         "name": "set configAssignment JsonString",
-        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vnf-topology-operation-input.service-information.service-instance-id   + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`\"/>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />",
+        "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vnf-topology-operation-input.service-information.service-instance-id   + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`\"/>\n",
         "comments": "",
-        "x": 441.66664123535156,
-        "y": 703.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 461.6666564941406,
+        "y": 685.3333568572998,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "91dde7fd.fe86a",
+        "id": "fd52ae4e.bd56c",
         "type": "execute",
         "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>\n <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\n <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\n <parameter name='action' value='`$action-name`' />\n <parameter name='mode' value='sync' />\n <parameter name='force' value='false' />\n <parameter name='ttl' value='0' />\n <parameter name='prefix' value='`$responsePrefix`' />\n <parameter name='payload' value=\"`'{\n  &quot;resource-assignment-request&quot;: {\n    &quot;template-prefix&quot;: [\n      &quot;' + $tmp.sdnc-artifact-name + '&quot;\n    ],\n    &quot;resource-assignment-properties&quot;: \n        ' + $tmp.json-payload + '\n  }\n}'`\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 449.33331298828125,
-        "y": 858,
-        "z": "58e8fb6f.65cbf4",
+        "x": 453.33331298828125,
+        "y": 888,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "7b68efaf.314158",
-                "7211bbf0.b473fc"
+                "51cecb46.839514",
+                "d8c1b9cb.9f5348"
             ]
         ]
     },
     {
-        "id": "7b68efaf.314158",
+        "id": "51cecb46.839514",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 689.3333129882812,
-        "y": 832,
-        "z": "58e8fb6f.65cbf4",
+        "x": 693.3333129882812,
+        "y": 862,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "e94b29ef.72631"
+                "5d166bf5.6d0624"
             ]
         ]
     },
     {
-        "id": "e94b29ef.72631",
+        "id": "5d166bf5.6d0624",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error from ConfigAssignmentNode\" />\n",
         "comments": "",
-        "x": 871.3333129882812,
-        "y": 853,
-        "z": "58e8fb6f.65cbf4",
+        "x": 875.3333129882812,
+        "y": 883,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "c497e61b.9d5da",
+        "id": "d29a4d92.8e7d9",
         "type": "for",
         "name": "for resource-accumulator-resolved-data loop",
         "xml": "<for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.66664123535156,
-        "y": 1075.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 477.66664123535156,
+        "y": 1105.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "a0e85ddc.4c617"
+                "fbbcea55.468248"
             ]
         ]
     },
     {
-        "id": "e4968d42.952ee8",
+        "id": "9947d8c1.f7aff8",
         "type": "set",
         "name": "set from resource-accumulator-resolved-data",
         "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n",
         "comments": "",
-        "x": 1703.6666412353516,
-        "y": 1127.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1707.6666412353516,
+        "y": 1157.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "5d2bdeb6.7712a",
+        "id": "84a90182.cf73",
         "type": "for",
         "name": "for capability-data",
         "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 398.66664123535156,
-        "y": 1417.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 402.66664123535156,
+        "y": 1447.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "59ba36cd.90352"
+                "fa102a2b.773698"
             ]
         ]
     },
     {
-        "id": "59ba36cd.90352",
+        "id": "fa102a2b.773698",
         "type": "for",
         "name": "for key-mapping",
         "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 607.6666412353516,
-        "y": 1417.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 611.6666412353516,
+        "y": 1447.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "c262587.ce01da8"
+                "420ba6ad.7d12f8"
             ]
         ]
     },
     {
-        "id": "a269720d.c1b3c",
+        "id": "c73b8162.24f6f",
         "type": "execute",
         "name": "execute jsonStringToCtx",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 417.66664123535156,
-        "y": 996.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 421.66664123535156,
+        "y": 1026.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "df3086f1.895f2",
+        "id": "95e79859.795e68",
         "type": "execute",
         "name": "execute generateUUID",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ",
         "comments": "",
         "outputs": 1,
-        "x": 423.66664123535156,
-        "y": 147.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 427.66664123535156,
+        "y": 177.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "7701fdb8.3f24cc"
+                "b2ef8bc8.f9b188"
             ]
         ]
     },
     {
-        "id": "7701fdb8.3f24cc",
+        "id": "b2ef8bc8.f9b188",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 601.6666412353516,
-        "y": 145.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 605.6666412353516,
+        "y": 175.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "1d32ed0e.9e31f3"
+                "359040a9.7ab45"
             ]
         ]
     },
     {
-        "id": "1d32ed0e.9e31f3",
+        "id": "359040a9.7ab45",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generateUUID is failed\" />\n",
         "comments": "",
-        "x": 748.6666412353516,
-        "y": 146.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 752.6666412353516,
+        "y": 176.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "c131d15b.1aef98",
+        "id": "2048f9bb.f2f736",
         "type": "for",
         "name": "for vnf-parameters-data.param",
         "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1446.6666412353516,
-        "y": 1075.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1450.6666412353516,
+        "y": 1105.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "3c69fe77.c81ada"
+                "b6d977b7.115288"
             ]
         ]
     },
     {
-        "id": "a0e85ddc.4c617",
+        "id": "fbbcea55.468248",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 752.6666412353516,
-        "y": 1076.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 756.6666412353516,
+        "y": 1106.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "c865c555.1438c8",
-                "69622bed.1e814c",
-                "8148c167.a33aa"
+                "4a737be7.870a34",
+                "20c5df3a.f6ffc",
+                "34f87842.282048"
             ]
         ]
     },
     {
-        "id": "33c58f5d.79c91",
+        "id": "3ac5cd34.2257f2",
         "type": "switchNode",
         "name": "switch vnf-parameters-data.param_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 475.66664123535156,
-        "y": 245.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 479.66664123535156,
+        "y": 275.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "80ce6f0d.c3a98",
-                "a0423db8.f01fe8"
+                "400017d.409bfe8",
+                "7d611aa7.76df04"
             ]
         ]
     },
     {
-        "id": "80ce6f0d.c3a98",
+        "id": "400017d.409bfe8",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 713.6666412353516,
-        "y": 213.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 717.6666412353516,
+        "y": 243.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "99ca71f9.ca2008"
+                "27c026e8.fb154a"
             ]
         ]
     },
     {
-        "id": "a0423db8.f01fe8",
+        "id": "7d611aa7.76df04",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 712.6666412353516,
-        "y": 277.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 716.6666412353516,
+        "y": 307.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "d63b03e5.819148"
+                "3e29b95e.47e686"
             ]
         ]
     },
     {
-        "id": "99ca71f9.ca2008",
+        "id": "27c026e8.fb154a",
         "type": "set",
         "name": "set pre service param len as 0",
         "xml": "<set>\n   <parameter name='highnum' value='0' />\n   <parameter name='prehighnum' value='0'/>\n",
         "comments": "",
-        "x": 926.6666412353516,
-        "y": 213.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 930.6666412353516,
+        "y": 243.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "d63b03e5.819148",
+        "id": "3e29b95e.47e686",
         "type": "set",
         "name": "set pre service param len",
         "xml": "<set>\n   <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />\n   <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />",
         "comments": "",
-        "x": 911.6666412353516,
-        "y": 277.3333339691162,
-        "z": "58e8fb6f.65cbf4",
+        "x": 915.6666412353516,
+        "y": 307.3333339691162,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "3c69fe77.c81ada",
+        "id": "b6d977b7.115288",
         "type": "switchNode",
         "name": "switch input vnf-name",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1704.6666412353516,
-        "y": 1075.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1708.6666412353516,
+        "y": 1105.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "f71f49f1.2930d"
+                "67c98419.11b03c"
             ]
         ]
     },
     {
-        "id": "f71f49f1.2930d",
+        "id": "67c98419.11b03c",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1884.6666412353516,
-        "y": 1075.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1888.6666412353516,
+        "y": 1105.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "6f785c18.a5a264"
+                "c179b41f.2921e8"
             ]
         ]
     },
     {
-        "id": "6f785c18.a5a264",
+        "id": "c179b41f.2921e8",
         "type": "set",
         "name": "set for existing param name",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n",
         "comments": "",
-        "x": 2094.6666412353516,
-        "y": 1076.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 2098.6666412353516,
+        "y": 1106.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "8148c167.a33aa",
+        "id": "34f87842.282048",
         "type": "switchNode",
         "name": "switch tmp.mso.param.not-found",
         "xml": "<switch test='`$tmp.mso.param.found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 994.6666412353516,
-        "y": 1128.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 998.6666412353516,
+        "y": 1158.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "43bd538.13b17ac"
+                "56f65a3d.bdecc4"
             ]
         ]
     },
     {
-        "id": "43bd538.13b17ac",
+        "id": "56f65a3d.bdecc4",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1228.6666412353516,
-        "y": 1127.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1232.6666412353516,
+        "y": 1157.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "8e656d8f.2c0638"
+                "ecce6565.d1e898"
             ]
         ]
     },
     {
-        "id": "c865c555.1438c8",
+        "id": "4a737be7.870a34",
         "type": "set",
         "name": "set for existing param name",
         "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n",
         "comments": "",
-        "x": 978.6666412353516,
-        "y": 1017.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 982.6666412353516,
+        "y": 1047.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "69622bed.1e814c",
+        "id": "20c5df3a.f6ffc",
         "type": "switchNode",
         "name": "switch check length > 0",
         "xml": "<switch test='`$prehighnum &gt; 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 971.1666412353516,
-        "y": 1076.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 975.1666412353516,
+        "y": 1106.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "d5b14a95.351558"
+                "278fa054.17f2"
             ]
         ]
     },
     {
-        "id": "d5b14a95.351558",
+        "id": "278fa054.17f2",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1218.1666412353516,
-        "y": 1076.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1222.1666412353516,
+        "y": 1106.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "c131d15b.1aef98"
+                "2048f9bb.f2f736"
             ]
         ]
     },
     {
-        "id": "530a0de5.6510fc",
+        "id": "910d6ed9.68335",
         "type": "for",
         "name": "for payload",
         "xml": "<for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1789.6666412353516,
-        "y": 1435.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1793.6666412353516,
+        "y": 1465.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "d780496.e20e538"
+                "451cb826.e55b18"
             ]
         ]
     },
     {
-        "id": "39414253.4d201e",
+        "id": "ebc212fd.50c99",
         "type": "set",
         "name": "set resource-key",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\n",
         "comments": "",
-        "x": 2138.6666412353516,
-        "y": 1371.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 2142.6666412353516,
+        "y": 1401.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "79092629.a0057",
+        "id": "77f8b842.ce0bf8",
         "type": "set",
         "name": "set output-data ",
         "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />",
         "comments": "",
-        "x": 1362.6666412353516,
-        "y": 1315.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1366.6666412353516,
+        "y": 1345.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "c262587.ce01da8",
+        "id": "420ba6ad.7d12f8",
         "type": "for",
         "name": "for output-key-mapping",
         "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 830.6666412353516,
-        "y": 1417.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 834.6666412353516,
+        "y": 1447.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "a651056f.79b248"
+                "de871bca.269b28"
             ]
         ]
     },
     {
-        "id": "a651056f.79b248",
+        "id": "de871bca.269b28",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1081.6666412353516,
-        "y": 1417.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1085.6666412353516,
+        "y": 1447.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "79092629.a0057",
-                "5a379da9.df18dc",
-                "37a6c3e.3ad683c",
-                "3d8ba937.dbc0d6"
+                "77f8b842.ce0bf8",
+                "d1ce4892.013d98",
+                "435b327b.50848c",
+                "833f0238.99363"
             ]
         ]
     },
     {
-        "id": "5a379da9.df18dc",
+        "id": "d1ce4892.013d98",
         "type": "set",
         "name": "set length",
         "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' value='`$highnum + 1`'/>\n",
         "comments": "",
-        "x": 1350.6666412353516,
-        "y": 1453.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1354.6666412353516,
+        "y": 1483.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "7211bbf0.b473fc",
+        "id": "d8c1b9cb.9f5348",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 694.3333129882812,
-        "y": 894,
-        "z": "58e8fb6f.65cbf4",
+        "x": 698.3333129882812,
+        "y": 924,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "e94b29ef.72631"
+                "5d166bf5.6d0624"
             ]
         ]
     },
     {
-        "id": "37a6c3e.3ad683c",
+        "id": "435b327b.50848c",
         "type": "switchNode",
         "name": "switch payload_length",
         "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1386.6666412353516,
-        "y": 1386.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1390.6666412353516,
+        "y": 1416.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "9c94dbb3.05da2",
-                "b6532788.a69bf8"
+                "a70ff081.a1c2e",
+                "cd6e211b.36062"
             ]
         ]
     },
     {
-        "id": "9c94dbb3.05da2",
+        "id": "a70ff081.a1c2e",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>",
         "comments": "",
         "outputs": 1,
-        "x": 1607.6666412353516,
-        "y": 1317.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1611.6666412353516,
+        "y": 1347.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "b6532788.a69bf8",
+        "id": "cd6e211b.36062",
         "type": "other",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1614.6666412353516,
-        "y": 1435.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1618.6666412353516,
+        "y": 1465.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "530a0de5.6510fc"
+                "910d6ed9.68335"
             ]
         ]
     },
     {
-        "id": "bf519ef3.d251",
+        "id": "c5829c3f.f44d7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1157.9523658752441,
-        "y": 632.9046821594238,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1161.9523658752441,
+        "y": 662.9046821594238,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "fbb3efb4.020878"
+                "9a929dee.aae27"
             ]
         ]
     },
     {
-        "id": "c6d0d2f9.dcf96",
+        "id": "7d1e7719.053288",
         "type": "set",
         "name": "set length",
         "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n",
         "comments": "",
-        "x": 2127.6666412353516,
-        "y": 1435.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 2131.6666412353516,
+        "y": 1465.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "8236fb65.2996b",
+        "id": "e4fba5aa.251098",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n",
         "comments": "",
-        "x": 2145.6666412353516,
-        "y": 1509.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 2149.6666412353516,
+        "y": 1539.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "3d8ba937.dbc0d6",
+        "id": "833f0238.99363",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n\n",
         "comments": "",
-        "x": 1371.6666412353516,
-        "y": 1520.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1375.6666412353516,
+        "y": 1550.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "8e656d8f.2c0638",
+        "id": "ecce6565.d1e898",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1405.6666412353516,
-        "y": 1126.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1409.6666412353516,
+        "y": 1156.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "e4968d42.952ee8",
-                "d52c802e.c9c1a8"
+                "9947d8c1.f7aff8",
+                "44e5b8af.77e3d8"
             ]
         ]
     },
     {
-        "id": "d52c802e.c9c1a8",
+        "id": "44e5b8af.77e3d8",
         "type": "set",
         "name": "increment length",
         "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
         "comments": "",
-        "x": 1620.6666412353516,
-        "y": 1186.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1624.6666412353516,
+        "y": 1216.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "d780496.e20e538",
+        "id": "451cb826.e55b18",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1945.6666412353516,
-        "y": 1436.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 1949.6666412353516,
+        "y": 1466.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             [
-                "39414253.4d201e",
-                "c6d0d2f9.dcf96",
-                "8236fb65.2996b"
+                "ebc212fd.50c99",
+                "7d1e7719.053288",
+                "e4fba5aa.251098"
             ]
         ]
     },
     {
-        "id": "ff9121b8.95fe6",
+        "id": "48b65c6e.618e44",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"BEFORE BlueprintProcessingClient\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 371.9999809265137,
-        "y": 779.333324432373,
-        "z": "58e8fb6f.65cbf4",
+        "x": 375.9999809265137,
+        "y": 809.333324432373,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "a656672e.be2f5",
+        "id": "80225cf4.2c8b2",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"AFTER BlueprintProcessingClient\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 368.6666488647461,
-        "y": 934.3333320617676,
-        "z": "58e8fb6f.65cbf4",
+        "x": 372.6666488647461,
+        "y": 964.3333320617676,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "8048ec03.29272",
+        "id": "638697ae.8d3678",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 377.00000762939453,
-        "y": 1738.5000267028809,
-        "z": "58e8fb6f.65cbf4",
+        "x": 381.00000762939453,
+        "y": 1768.5000267028809,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             []
         ]
     },
     {
-        "id": "479d04c2.fc7acc",
+        "id": "a4083479.8e5dd8",
         "type": "set",
         "name": "set pathname",
         "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vnf-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\" />\n",
         "comments": "",
-        "x": 383.25000762939453,
-        "y": 1686.0000247955322,
-        "z": "58e8fb6f.65cbf4",
+        "x": 387.25000762939453,
+        "y": 1716.0000247955322,
+        "z": "4a0b2401.ec39ec",
         "wires": []
     },
     {
-        "id": "c8325ee3.97b988",
+        "id": "2e936c1f.cb2bd4",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: vnf-ra-assignment\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 360.75000381469727,
-        "y": 1639.7500247955322,
-        "z": "58e8fb6f.65cbf4",
+        "x": 364.75000381469727,
+        "y": 1669.7500247955322,
+        "z": "4a0b2401.ec39ec",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "546a230c.3e01dc",
+        "type": "set",
+        "name": "set updateJsonPayload",
+        "xml": "<set>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n<parameter name=\"`$cds + 'payload.template-prefix'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />",
+        "comments": "",
+        "x": 430.0000457763672,
+        "y": 736.3333587646484,
+        "z": "4a0b2401.ec39ec",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
index d13570cc..f85ff1a7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "60f8bdf7.1ecdb4",
+        "id": "7f94573d.1aa9b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 153,
-        "y": 59.413658142089844,
-        "z": "a72b1b1f.95ba58",
+        "x": 110,
+        "y": 57.413658142089844,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "443d0508.99432c"
+                "53bfc824.9a76c8"
             ]
         ]
     },
     {
-        "id": "443d0508.99432c",
+        "id": "53bfc824.9a76c8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1230 +22,1341 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 266.28570556640625,
-        "y": 99.65176963806152,
-        "z": "a72b1b1f.95ba58",
+        "x": 223.28570556640625,
+        "y": 97.65176963806152,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "eb94899e.b6b1a8"
+                "73e2a9e7.337db8"
             ]
         ]
     },
     {
-        "id": "eb94899e.b6b1a8",
+        "id": "73e2a9e7.337db8",
         "type": "method",
         "name": "method vf-module-topology-operation",
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 240.42862701416016,
-        "y": 139.41365242004395,
-        "z": "a72b1b1f.95ba58",
+        "x": 197.42862701416016,
+        "y": 137.41365242004395,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "d840e5a2.3f7788"
+                "71975c08.e015c4"
             ]
         ]
     },
     {
-        "id": "e2dfb49b.0a0018",
+        "id": "f37eed7c.56eaf8",
         "type": "comment",
         "name": "vf-module-topology-operation",
         "info": "",
         "comments": "",
-        "x": 470.34483337402344,
-        "y": 42,
-        "z": "a72b1b1f.95ba58",
+        "x": 427.34483337402344,
+        "y": 40,
+        "z": "493735c0.a952fc",
         "wires": []
     },
     {
-        "id": "d840e5a2.3f7788",
+        "id": "71975c08.e015c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 222.50003814697266,
-        "y": 378.77383041381836,
-        "z": "a72b1b1f.95ba58",
+        "x": 179.50003814697266,
+        "y": 376.77383041381836,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "82c3b371.373ab",
-                "45744240.a8fecc",
-                "af8762d1.2370a"
+                "c09887fc.d299f8",
+                "4926b9f5.ab5c7",
+                "f89252a4.af5fa"
             ]
         ]
     },
     {
-        "id": "82c3b371.373ab",
+        "id": "c09887fc.d299f8",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 508.0000305175781,
-        "y": 552.27121925354,
-        "z": "a72b1b1f.95ba58",
+        "x": 465.0000305175781,
+        "y": 550.27121925354,
+        "z": "493735c0.a952fc",
         "wires": []
     },
     {
-        "id": "45744240.a8fecc",
+        "id": "4926b9f5.ab5c7",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 518.9046401977539,
-        "y": 376.9850549697876,
-        "z": "a72b1b1f.95ba58",
+        "x": 475.9046401977539,
+        "y": 374.9850549697876,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "400fbd10.304f54",
-                "b423bb62.fc6a38",
-                "d0eb7f3.388888",
-                "5337ec3d.0febd4",
-                "37531078.1941c",
-                "1af62602.8b12ba",
-                "dcf909ef.aba7f8",
-                "c5e2d1b7.6be4b"
+                "7d5db9d9.ad0e38",
+                "3bd4270d.a241e",
+                "c98ec688.2f486",
+                "1b25ba4e.75c82e",
+                "4d85225d.72c3cc",
+                "3ef68b65.7a1b4c",
+                "60b28642.cd3218",
+                "2e12e4fa.1580b4",
+                "b99c1f3f.e6afb"
             ]
         ]
     },
     {
-        "id": "400fbd10.304f54",
+        "id": "7d5db9d9.ad0e38",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 728.3809204101562,
-        "y": 267.2708921432495,
-        "z": "a72b1b1f.95ba58",
+        "x": 685.3809204101562,
+        "y": 265.2708921432495,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "826f3bce.8ed388"
+                "965ae23f.9fa918"
             ]
         ]
     },
     {
-        "id": "b423bb62.fc6a38",
+        "id": "3bd4270d.a241e",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 736.761905670166,
-        "y": 413.4615840911865,
-        "z": "a72b1b1f.95ba58",
+        "x": 693.761905670166,
+        "y": 411.4615840911865,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "671070dd.51814"
+                "5bd2b2dc.3bca44"
             ]
         ]
     },
     {
-        "id": "d0eb7f3.388888",
+        "id": "c98ec688.2f486",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 676.4762802124023,
-        "y": 1643.9851942062378,
-        "z": "a72b1b1f.95ba58",
+        "x": 597.4762573242188,
+        "y": 1826.9852294921875,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "cae0cae7.d054f8"
+                "733f298.51afc58"
             ]
         ]
     },
     {
-        "id": "cae0cae7.d054f8",
+        "id": "733f298.51afc58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 870.6667060852051,
-        "y": 1643.9852628707886,
-        "z": "a72b1b1f.95ba58",
+        "x": 791.6666831970215,
+        "y": 1826.9852981567383,
+        "z": "493735c0.a952fc",
         "wires": []
     },
     {
-        "id": "af8762d1.2370a",
+        "id": "f89252a4.af5fa",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 638.0832824707031,
-        "y": 216.79471492767334,
-        "z": "a72b1b1f.95ba58",
+        "x": 595.0832824707031,
+        "y": 214.79471492767334,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "826f3bce.8ed388",
+        "id": "965ae23f.9fa918",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1100.523754119873,
-        "y": 266.84235668182373,
-        "z": "a72b1b1f.95ba58",
+        "x": 1057.523754119873,
+        "y": 264.84235668182373,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b23074e.0b6df8",
+        "id": "1324ee03.e7df4a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1112.5237121582031,
-        "y": 363.5089998245239,
-        "z": "a72b1b1f.95ba58",
+        "x": 1069.5237121582031,
+        "y": 361.5089998245239,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "671070dd.51814",
+        "id": "5bd2b2dc.3bca44",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1106.8569831848145,
-        "y": 413.17571926116943,
-        "z": "a72b1b1f.95ba58",
+        "x": 1063.8569831848145,
+        "y": 411.17571926116943,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a162b8d.203e04",
+        "id": "4a3a38c7.8c78b",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 740.8569984436035,
-        "y": 364.17567348480225,
-        "z": "a72b1b1f.95ba58",
+        "x": 697.8569984436035,
+        "y": 362.17567348480225,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "8b23074e.0b6df8"
+                "1324ee03.e7df4a"
             ]
         ]
     },
     {
-        "id": "5337ec3d.0febd4",
+        "id": "1b25ba4e.75c82e",
         "type": "outcome",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 751.3333206176758,
-        "y": 461.08031368255615,
-        "z": "a72b1b1f.95ba58",
+        "x": 708.3333206176758,
+        "y": 459.08031368255615,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "5fccb04e.7aca4"
+                "321153c2.713aac"
             ]
         ]
     },
     {
-        "id": "5fccb04e.7aca4",
+        "id": "321153c2.713aac",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1120.4283905029297,
-        "y": 460.7944498062134,
-        "z": "a72b1b1f.95ba58",
+        "x": 1077.4283905029297,
+        "y": 458.7944498062134,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "37531078.1941c",
+        "id": "4d85225d.72c3cc",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 737,
-        "y": 659.4136581420898,
-        "z": "a72b1b1f.95ba58",
+        "x": 694,
+        "y": 657.4136581420898,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "3ae69b6c.fc6664"
+                "a8c66c29.fddec8"
             ]
         ]
     },
     {
-        "id": "cb85e946.697488",
+        "id": "fc31a6f4.807ee8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 975.3336029052734,
-        "y": 667.0000213086605,
-        "z": "a72b1b1f.95ba58",
+        "x": 932.3336029052734,
+        "y": 665.0000213086605,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e1f46c8f.0f8ef",
-                "6d091724.521778",
-                "cd73a097.4d141",
-                "9c2f6ea9.9f71",
-                "32e42e81.923742",
-                "bb150aac.372ef8"
+                "354f981.3fa2f68",
+                "8a95b3a4.ddc598",
+                "4d9a6033.5edfa8",
+                "864be42d.6bad08",
+                "b387cf37.df8cc",
+                "e0078c0f.b00658"
             ]
         ]
     },
     {
-        "id": "6d091724.521778",
+        "id": "8a95b3a4.ddc598",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1265.8099212646484,
-        "y": 575.4793901443481,
-        "z": "a72b1b1f.95ba58",
+        "x": 1222.8099212646484,
+        "y": 573.4793901443481,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "61f9f776.74e028"
+                "683f2801.170988"
             ]
         ]
     },
     {
-        "id": "e1f46c8f.0f8ef",
+        "id": "354f981.3fa2f68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1175.7143859863281,
-        "y": 750.8572845458984,
-        "z": "a72b1b1f.95ba58",
+        "x": 1132.7143859863281,
+        "y": 748.8572845458984,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e7075778.492688"
+                "b57a7e92.19b9a"
             ]
         ]
     },
     {
-        "id": "3ae69b6c.fc6664",
+        "id": "a8c66c29.fddec8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 923.3335189819336,
-        "y": 587.0000228881836,
-        "z": "a72b1b1f.95ba58",
+        "x": 880.3335189819336,
+        "y": 585.0000228881836,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "cb85e946.697488",
-                "56c1945d.3e8c8c"
+                "fc31a6f4.807ee8",
+                "47960a97.91ab8c"
             ]
         ]
     },
     {
-        "id": "61f9f776.74e028",
+        "id": "683f2801.170988",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1689.3337936401367,
-        "y": 574.0001664161682,
-        "z": "a72b1b1f.95ba58",
+        "x": 1646.3337936401367,
+        "y": 572.0001664161682,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7075778.492688",
+        "id": "b57a7e92.19b9a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1329.0000381469727,
-        "y": 750.9136810302734,
-        "z": "a72b1b1f.95ba58",
+        "x": 1286.0000381469727,
+        "y": 748.9136810302734,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "cd73a097.4d141",
+        "id": "4d9a6033.5edfa8",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1239.6667785644531,
-        "y": 709.2471752166748,
-        "z": "a72b1b1f.95ba58",
+        "x": 1196.6667785644531,
+        "y": 707.2471752166748,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "5c17a60.656ff5c"
+                "f12da86a.70ee18"
             ]
         ]
     },
     {
-        "id": "5c17a60.656ff5c",
+        "id": "f12da86a.70ee18",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1712.1904754638672,
-        "y": 708.7679271697998,
-        "z": "a72b1b1f.95ba58",
+        "x": 1669.1904754638672,
+        "y": 706.7679271697998,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c2f6ea9.9f71",
+        "id": "864be42d.6bad08",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1248.0311012268066,
-        "y": 629.4451355934143,
-        "z": "a72b1b1f.95ba58",
+        "x": 1205.0311012268066,
+        "y": 627.4451355934143,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "eea9f4ee.a0af98"
+                "50e37058.feb9b"
             ]
         ]
     },
     {
-        "id": "eea9f4ee.a0af98",
+        "id": "50e37058.feb9b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1703.554889678955,
-        "y": 628.9660048484802,
-        "z": "a72b1b1f.95ba58",
+        "x": 1660.554889678955,
+        "y": 626.9660048484802,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "32e42e81.923742",
+        "id": "b387cf37.df8cc",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1278.0000190734863,
-        "y": 528.4137101173401,
-        "z": "a72b1b1f.95ba58",
+        "x": 1235.0000190734863,
+        "y": 526.4137101173401,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "28c101e9.f0aa4e"
+                "965ad1aa.2d9608"
             ]
         ]
     },
     {
-        "id": "28c101e9.f0aa4e",
+        "id": "965ad1aa.2d9608",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1686.5237922668457,
-        "y": 525.9344773292542,
-        "z": "a72b1b1f.95ba58",
+        "x": 1643.5237922668457,
+        "y": 523.9344773292542,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "1af62602.8b12ba",
+        "id": "3ef68b65.7a1b4c",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 727,
-        "y": 854.7469711303711,
-        "z": "a72b1b1f.95ba58",
+        "x": 684,
+        "y": 852.7469711303711,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "c0bc6360.1bcc6"
+                "661b6cec.852cdc"
             ]
         ]
     },
     {
-        "id": "75a4368f.b06cb8",
+        "id": "544c0912.e1e7",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1257.143051147461,
-        "y": 857.6459245681763,
-        "z": "a72b1b1f.95ba58",
+        "x": 1214.143051147461,
+        "y": 855.6459245681763,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "a304d42c.96b1a8"
+                "17e60c84.8e005b"
             ]
         ]
     },
     {
-        "id": "c0bc6360.1bcc6",
+        "id": "661b6cec.852cdc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 907.6667709350586,
-        "y": 850.1666479110718,
-        "z": "a72b1b1f.95ba58",
+        "x": 864.6667709350586,
+        "y": 848.1666479110718,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "37ab676.385ac98"
+                "d64d4fe2.5b9a28"
             ]
         ]
     },
     {
-        "id": "a304d42c.96b1a8",
+        "id": "17e60c84.8e005b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1669.6669387817383,
-        "y": 851.1667070388794,
-        "z": "a72b1b1f.95ba58",
+        "x": 1626.6669387817383,
+        "y": 849.1667070388794,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cc762ff.e3018d",
+        "id": "3bf3bf04.d083f8",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1246.3334884643555,
-        "y": 903.6667132377625,
-        "z": "a72b1b1f.95ba58",
+        "x": 1203.3334884643555,
+        "y": 901.6667132377625,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "16f3b753.49c909"
+                "6245ee1b.e1d3c"
             ]
         ]
     },
     {
-        "id": "16f3b753.49c909",
+        "id": "6245ee1b.e1d3c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1681.8571853637695,
-        "y": 903.1874856948853,
-        "z": "a72b1b1f.95ba58",
+        "x": 1638.8571853637695,
+        "y": 901.1874856948853,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "4032b094.cc8d9",
+        "id": "a7ddf2b7.d5012",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1680.3333129882812,
-        "y": 988.6666674613953,
-        "z": "a72b1b1f.95ba58",
+        "x": 1637.3333129882812,
+        "y": 986.6666674613953,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "fab9a958.f65228",
+        "id": "4afd22ac.e5ea1c",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1244.8096160888672,
-        "y": 989.1458950042725,
-        "z": "a72b1b1f.95ba58",
+        "x": 1201.8096160888672,
+        "y": 987.1458950042725,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "4032b094.cc8d9"
+                "a7ddf2b7.d5012"
             ]
         ]
     },
     {
-        "id": "37ab676.385ac98",
+        "id": "d64d4fe2.5b9a28",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 984,
-        "y": 916.7469711303711,
-        "z": "a72b1b1f.95ba58",
+        "x": 941,
+        "y": 914.7469711303711,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "75a4368f.b06cb8",
-                "1cc762ff.e3018d",
-                "fab9a958.f65228",
-                "a8fd2164.39975",
-                "5e8479ea.a8f1a8",
-                "38b66458.dc919c"
+                "544c0912.e1e7",
+                "3bf3bf04.d083f8",
+                "4afd22ac.e5ea1c",
+                "66a81340.923bf4",
+                "66dc453c.fc1e54",
+                "6317efef.fce608"
             ]
         ]
     },
     {
-        "id": "a8fd2164.39975",
+        "id": "66a81340.923bf4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1176.5714797973633,
-        "y": 1037.9584803581238,
-        "z": "a72b1b1f.95ba58",
+        "x": 1133.5714797973633,
+        "y": 1035.9584803581238,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "596d0c66.ce00c4"
+                "598c0313.5471bc"
             ]
         ]
     },
     {
-        "id": "5e8479ea.a8f1a8",
+        "id": "66dc453c.fc1e54",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1260,
-        "y": 812.7469711303711,
-        "z": "a72b1b1f.95ba58",
+        "x": 1217,
+        "y": 810.7469711303711,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "75b93508.0a740c"
+                "21aac5f2.3ee152"
             ]
         ]
     },
     {
-        "id": "75b93508.0a740c",
+        "id": "21aac5f2.3ee152",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1675.5238037109375,
-        "y": 806.2677478790283,
-        "z": "a72b1b1f.95ba58",
+        "x": 1632.5238037109375,
+        "y": 804.2677478790283,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "dcf909ef.aba7f8",
+        "id": "60b28642.cd3218",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 710.9999923706055,
-        "y": 1140.747064113617,
-        "z": "a72b1b1f.95ba58",
+        "x": 667.9999923706055,
+        "y": 1138.747064113617,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "ddecd7f6.9ecef8"
+                "c83f7131.ad7d"
             ]
         ]
     },
     {
-        "id": "fa2b90a6.ddc62",
+        "id": "494e3a53.b269cc",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1249.1431121826172,
-        "y": 1140.6460342407227,
-        "z": "a72b1b1f.95ba58",
+        "x": 1206.1431121826172,
+        "y": 1138.6460342407227,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "d468a55.f677158"
+                "6783e95d.0fc418"
             ]
         ]
     },
     {
-        "id": "ddecd7f6.9ecef8",
+        "id": "c83f7131.ad7d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 891.6667633056641,
-        "y": 1136.1667408943176,
-        "z": "a72b1b1f.95ba58",
+        "x": 848.6667633056641,
+        "y": 1134.1667408943176,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e10a09ee.1e0d18"
+                "854cfeba.5c1998"
             ]
         ]
     },
     {
-        "id": "d468a55.f677158",
+        "id": "6783e95d.0fc418",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1666.666877746582,
-        "y": 1142.1667709350586,
-        "z": "a72b1b1f.95ba58",
+        "x": 1623.666877746582,
+        "y": 1140.1667709350586,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5211acb.613d58",
+        "id": "5a56c8ff.fdd22",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1230.333480834961,
-        "y": 1189.6668062210083,
-        "z": "a72b1b1f.95ba58",
+        "x": 1187.333480834961,
+        "y": 1187.6668062210083,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "b45a3e18.c78af"
+                "5670491c.f974d"
             ]
         ]
     },
     {
-        "id": "b45a3e18.c78af",
+        "id": "5670491c.f974d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1665.857177734375,
-        "y": 1189.187578678131,
-        "z": "a72b1b1f.95ba58",
+        "x": 1622.857177734375,
+        "y": 1187.187578678131,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f5baedc.d1b98",
+        "id": "37d4bd75.8979ea",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1663.3333892822266,
-        "y": 1267.6667804718018,
-        "z": "a72b1b1f.95ba58",
+        "x": 1620.3333892822266,
+        "y": 1265.6667804718018,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "78ae2747.e70608",
+        "id": "66db4ece.f7fd6",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1227.8096923828125,
-        "y": 1268.146008014679,
-        "z": "a72b1b1f.95ba58",
+        "x": 1184.8096923828125,
+        "y": 1266.146008014679,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "6f5baedc.d1b98"
+                "37d4bd75.8979ea"
             ]
         ]
     },
     {
-        "id": "e10a09ee.1e0d18",
+        "id": "854cfeba.5c1998",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 967.9999923706055,
-        "y": 1202.747064113617,
-        "z": "a72b1b1f.95ba58",
+        "x": 924.9999923706055,
+        "y": 1200.747064113617,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "fa2b90a6.ddc62",
-                "b5211acb.613d58",
-                "78ae2747.e70608",
-                "f85122c3.f22fe",
-                "d175e790.8c0a68",
-                "e6ce30bc.2212e"
+                "494e3a53.b269cc",
+                "5a56c8ff.fdd22",
+                "66db4ece.f7fd6",
+                "c3ff1e72.3d8938",
+                "5aa69599.5bf6d4",
+                "b2250aab.0c69d8"
             ]
         ]
     },
     {
-        "id": "f85122c3.f22fe",
+        "id": "c3ff1e72.3d8938",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1163.5714263916016,
-        "y": 1317.9585704803467,
-        "z": "a72b1b1f.95ba58",
+        "x": 1120.5714263916016,
+        "y": 1315.9585704803467,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "27b59f76.ee972"
+                "3b62d3d9.f8eab4"
             ]
         ]
     },
     {
-        "id": "d175e790.8c0a68",
+        "id": "5aa69599.5bf6d4",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1243.9999923706055,
-        "y": 1098.747064113617,
-        "z": "a72b1b1f.95ba58",
+        "x": 1200.9999923706055,
+        "y": 1096.747064113617,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "4dcb10ca.91b76"
+                "6252df01.3597a"
             ]
         ]
     },
     {
-        "id": "4dcb10ca.91b76",
+        "id": "6252df01.3597a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1659.523796081543,
-        "y": 1092.2678408622742,
-        "z": "a72b1b1f.95ba58",
+        "x": 1616.523796081543,
+        "y": 1090.2678408622742,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "27b59f76.ee972",
+        "id": "3b62d3d9.f8eab4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1502.0001068115234,
-        "y": 1318.4137811660767,
-        "z": "a72b1b1f.95ba58",
+        "x": 1459.0001068115234,
+        "y": 1316.4137811660767,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "596d0c66.ce00c4",
+        "id": "598c0313.5471bc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1506.9999923706055,
-        "y": 1035.4136900901794,
-        "z": "a72b1b1f.95ba58",
+        "x": 1463.9999923706055,
+        "y": 1033.4136900901794,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c5c47e5.7d7ac8",
+        "id": "14afa7be.e27dc8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1104.99995803833,
-        "y": 314.41364574432373,
-        "z": "a72b1b1f.95ba58",
+        "x": 1061.99995803833,
+        "y": 312.41364574432373,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "92267a8e.9c90e8",
+        "id": "54e2eced.ad10ac",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 732.999942779541,
-        "y": 315.0803232192993,
-        "z": "a72b1b1f.95ba58",
+        "x": 689.999942779541,
+        "y": 313.0803232192993,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "8c5c47e5.7d7ac8"
+                "14afa7be.e27dc8"
             ]
         ]
     },
     {
-        "id": "c5e2d1b7.6be4b",
+        "id": "2e12e4fa.1580b4",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 674.0000381469727,
-        "y": 1486.0803928375244,
-        "z": "a72b1b1f.95ba58",
+        "x": 631.0000381469727,
+        "y": 1484.0803928375244,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "efa2965.8f0dc68"
+                "33a7ef53.e934b"
             ]
         ]
     },
     {
-        "id": "44d29826.e75ef8",
+        "id": "ad2402bf.1c98f8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 913.3335571289062,
-        "y": 1486.6667594909668,
-        "z": "a72b1b1f.95ba58",
+        "x": 870.3335571289062,
+        "y": 1484.6667594909668,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "b28c13f1.1d076",
-                "e39671f.04a299",
-                "bff79d49.ee60c",
-                "2a96734d.12075c",
-                "c0a6c4b4.41fcd8",
-                "ca85561c.80bf88"
+                "faba584.b26f228",
+                "5b627b00.db32b4",
+                "5681133e.5cc914",
+                "218e055.5ef2a7a",
+                "63c6c514.9c1dbc",
+                "f4308b39.a2e5b"
             ]
         ]
     },
     {
-        "id": "e39671f.04a299",
+        "id": "5b627b00.db32b4",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1198.8101043701172,
-        "y": 1420.146159172058,
-        "z": "a72b1b1f.95ba58",
+        "x": 1155.8101043701172,
+        "y": 1418.146159172058,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "c68b80f6.353d3"
+                "e5e26c94.b2c39"
             ]
         ]
     },
     {
-        "id": "b28c13f1.1d076",
+        "id": "faba584.b26f228",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1112.7144241333008,
-        "y": 1577.524019241333,
-        "z": "a72b1b1f.95ba58",
+        "x": 1069.7144241333008,
+        "y": 1575.524019241333,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "ddab3c2b.d8382"
+                "d9cc9704.5b361"
             ]
         ]
     },
     {
-        "id": "efa2965.8f0dc68",
+        "id": "33a7ef53.e934b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 860.3335571289062,
-        "y": 1413.6667575836182,
-        "z": "a72b1b1f.95ba58",
+        "x": 817.3335571289062,
+        "y": 1411.6667575836182,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "44d29826.e75ef8"
+                "ad2402bf.1c98f8"
             ]
         ]
     },
     {
-        "id": "c68b80f6.353d3",
+        "id": "e5e26c94.b2c39",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1602.3337173461914,
-        "y": 1415.667004108429,
-        "z": "a72b1b1f.95ba58",
+        "x": 1559.3337173461914,
+        "y": 1413.667004108429,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddab3c2b.d8382",
+        "id": "d9cc9704.5b361",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1266.0000762939453,
-        "y": 1577.580415725708,
-        "z": "a72b1b1f.95ba58",
+        "x": 1223.0000762939453,
+        "y": 1575.580415725708,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "bff79d49.ee60c",
+        "id": "5681133e.5cc914",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1176.6668167114258,
-        "y": 1535.9139099121094,
-        "z": "a72b1b1f.95ba58",
+        "x": 1133.6668167114258,
+        "y": 1533.9139099121094,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "337fe6a3.136d9a"
+                "fa693b23.6d7988"
             ]
         ]
     },
     {
-        "id": "337fe6a3.136d9a",
+        "id": "fa693b23.6d7988",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1649.1905136108398,
-        "y": 1535.4346618652344,
-        "z": "a72b1b1f.95ba58",
+        "x": 1606.1905136108398,
+        "y": 1533.4346618652344,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a96734d.12075c",
+        "id": "218e055.5ef2a7a",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1201.0312118530273,
-        "y": 1459.1117978096008,
-        "z": "a72b1b1f.95ba58",
+        "x": 1158.0312118530273,
+        "y": 1457.1117978096008,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "b031ab54.0032d8"
+                "5a1a4f39.b559a8"
             ]
         ]
     },
     {
-        "id": "b031ab54.0032d8",
+        "id": "5a1a4f39.b559a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1615.555030822754,
-        "y": 1454.6327023506165,
-        "z": "a72b1b1f.95ba58",
+        "x": 1572.555030822754,
+        "y": 1452.6327023506165,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0a6c4b4.41fcd8",
+        "id": "63c6c514.9c1dbc",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1205.0000686645508,
-        "y": 1379.080410003662,
-        "z": "a72b1b1f.95ba58",
+        "x": 1162.0000686645508,
+        "y": 1377.080410003662,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "b82dcb91.bd0a48"
+                "651c4a0c.4cbb5c"
             ]
         ]
     },
     {
-        "id": "b82dcb91.bd0a48",
+        "id": "651c4a0c.4cbb5c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1598.5238723754883,
-        "y": 1379.6011776924133,
-        "z": "a72b1b1f.95ba58",
+        "x": 1555.5238723754883,
+        "y": 1377.6011776924133,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "56c1945d.3e8c8c",
+        "id": "47960a97.91ab8c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1064.75,
-        "y": 536.0039075314999,
-        "z": "a72b1b1f.95ba58",
+        "x": 1021.75,
+        "y": 534.0039075314999,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb150aac.372ef8",
+        "id": "e0078c0f.b00658",
         "type": "outcome",
         "name": "CreateSDWANLanPortInstance",
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1241.7434997558594,
-        "y": 670.2539086341858,
-        "z": "a72b1b1f.95ba58",
+        "x": 1198.7434997558594,
+        "y": 668.2539086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "afa9c085.4aa7a"
+                "4cf5d326.e70d2c"
             ]
         ]
     },
     {
-        "id": "afa9c085.4aa7a",
+        "id": "4cf5d326.e70d2c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1714.2671966552734,
-        "y": 669.7746605873108,
-        "z": "a72b1b1f.95ba58",
+        "x": 1671.2671966552734,
+        "y": 667.7746605873108,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "38b66458.dc919c",
+        "id": "6317efef.fce608",
         "type": "outcome",
         "name": "ActivateSDWANLanPortInstance",
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1253.7434997558594,
-        "y": 947.5039086341858,
-        "z": "a72b1b1f.95ba58",
+        "x": 1210.7434997558594,
+        "y": 945.5039086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "807c782f.46b268"
+                "ad2dda1f.42803"
             ]
         ]
     },
     {
-        "id": "807c782f.46b268",
+        "id": "ad2dda1f.42803",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1671.2671508789062,
-        "y": 947.024670124054,
-        "z": "a72b1b1f.95ba58",
+        "x": 1628.2671508789062,
+        "y": 945.024670124054,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6ce30bc.2212e",
+        "id": "b2250aab.0c69d8",
         "type": "outcome",
         "name": "DeactivateSDWANLanPortInstance",
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1239.7434997558594,
-        "y": 1233.7539086341858,
-        "z": "a72b1b1f.95ba58",
+        "x": 1196.7434997558594,
+        "y": 1231.7539086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "226ea68a.974c4a"
+                "f7cfaeb8.3fd438"
             ]
         ]
     },
     {
-        "id": "226ea68a.974c4a",
+        "id": "f7cfaeb8.3fd438",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1657.2671508789062,
-        "y": 1233.274670124054,
-        "z": "a72b1b1f.95ba58",
+        "x": 1614.2671508789062,
+        "y": 1231.274670124054,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca85561c.80bf88",
+        "id": "f4308b39.a2e5b",
         "type": "outcome",
         "name": "DeleteSDWANLanPortInstance",
         "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1203.7434997558594,
-        "y": 1496.7539086341858,
-        "z": "a72b1b1f.95ba58",
+        "x": 1160.7434997558594,
+        "y": 1494.7539086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "372e65c0.54946a"
+                "98ff9895.6aef48"
             ]
         ]
     },
     {
-        "id": "372e65c0.54946a",
+        "id": "98ff9895.6aef48",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1621.2671508789062,
-        "y": 1496.274670124054,
-        "z": "a72b1b1f.95ba58",
+        "x": 1578.2671508789062,
+        "y": 1494.274670124054,
+        "z": "493735c0.a952fc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b99c1f3f.e6afb",
+        "type": "outcome",
+        "name": "update",
+        "xml": "<outcome value='update'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 602,
+        "y": 1623,
+        "z": "493735c0.a952fc",
+        "wires": [
+            [
+                "c6d60a18.353d58"
+            ]
+        ]
+    },
+    {
+        "id": "c6d60a18.353d58",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 776.33349609375,
+        "y": 1627.5864868164062,
+        "z": "493735c0.a952fc",
+        "wires": [
+            [
+                "ee329c14.143048"
+            ]
+        ]
+    },
+    {
+        "id": "ee329c14.143048",
+        "type": "switchNode",
+        "name": "switch request-action",
+        "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 932.33349609375,
+        "y": 1697.5864868164062,
+        "z": "493735c0.a952fc",
+        "wires": [
+            [
+                "342f4246.9d954e",
+                "8235fd9d.7ee738"
+            ]
+        ]
+    },
+    {
+        "id": "342f4246.9d954e",
+        "type": "outcome",
+        "name": "SdwanBandwidthChange",
+        "xml": "<outcome value='SdwanBandwidthChange'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1170.9999771118164,
+        "y": 1653.0001201629639,
+        "z": "493735c0.a952fc",
+        "wires": [
+            [
+                "5223bfb2.d63e18"
+            ]
+        ]
+    },
+    {
+        "id": "5223bfb2.d63e18",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1564.523780822754,
+        "y": 1653.520887851715,
+        "z": "493735c0.a952fc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8235fd9d.7ee738",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1096.7143325805664,
+        "y": 1726.4437236785889,
+        "z": "493735c0.a952fc",
+        "wires": [
+            [
+                "668547c7.be02a"
+            ]
+        ]
+    },
+    {
+        "id": "668547c7.be02a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1249.999984741211,
+        "y": 1726.5001201629639,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.json
index f9f7a42d..df3c74f5 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "2f944e3f.133922",
+        "id": "9a049bb3.4cc658",
         "type": "method",
         "name": "method sdwan-bandwidth-policy-change",
         "xml": "<method rpc='sdwan-bandwidth-policy-change' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 228,
-        "y": 177.58634185791016,
-        "z": "fe3a5d18.ca1b6",
+        "x": 224.56666564941406,
+        "y": 188.98631858825684,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "ab448c0a.7a72d"
+                "68698faf.6a5e4"
             ]
         ]
     },
     {
-        "id": "c5904683.1a03e8",
+        "id": "a7d83b15.019fd8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 117,
-        "y": 32.00000190734863,
-        "z": "fe3a5d18.ca1b6",
+        "x": 113.56666564941406,
+        "y": 43.39997863769531,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "6bc6460b.0fa818"
+                "643409a4.699f8"
             ]
         ]
     },
     {
-        "id": "6bc6460b.0fa818",
+        "id": "643409a4.699f8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -38,1953 +38,2001 @@
         "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='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 216.28570556640625,
-        "y": 83.23810958862305,
-        "z": "fe3a5d18.ca1b6",
+        "x": 212.8523712158203,
+        "y": 94.63808631896973,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "2f944e3f.133922"
+                "9a049bb3.4cc658"
             ]
         ]
     },
     {
-        "id": "ab448c0a.7a72d",
+        "id": "68698faf.6a5e4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 176.6666717529297,
-        "y": 459.6667175292969,
-        "z": "fe3a5d18.ca1b6",
+        "x": 173.23333740234375,
+        "y": 471.06669425964355,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "12f15f6d.9827f1",
-                "fe00d9f.b56fd28",
-                "6684c99a.7427e8",
-                "2af6c94c.af19e6",
-                "e293366.5ca59c8",
-                "ed22f7f1.ec7288",
-                "1a81feba.045cb1",
-                "565469d0.7320a8",
-                "6d629a7b.45bc64",
-                "a9a5c4dd.f02338",
-                "b2fc342f.6c0b68",
-                "23f3a49a.a36dac",
-                "325ec5e8.8f682a",
-                "fb6cf9c5.202108",
-                "df7c0c81.e6dd8",
-                "95135039.a60aa",
-                "e76d9029.37f13",
-                "55e5acbf.fe5b24",
-                "bf167ea6.f9992",
-                "89ecf7ea.f65c78"
+                "5e98bf05.e67a08",
+                "dfba78b2.cf5278",
+                "647253ac.fc0934",
+                "87568bca.067338",
+                "5fd7672d.efd348",
+                "8f8f069f.d3b5f",
+                "45255c46.056ca4",
+                "aaf4a45e.8000f",
+                "5a004830.6f6608",
+                "34c4a2e.64014de",
+                "1e6767eb.165f58",
+                "4fea1987.fd6de8",
+                "9a1087dc.7cf728",
+                "ce9e8fbf.c64eb8",
+                "46021ece.1d213",
+                "c5a35f5.403d42",
+                "72a6e071.e177a8",
+                "3576832.1dfbb7c",
+                "ae8b2331.d9b508",
+                "83f66961.dd8d88"
             ]
         ]
     },
     {
-        "id": "fe00d9f.b56fd28",
+        "id": "dfba78b2.cf5278",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 554.0313873291016,
-        "y": 257.26914978027344,
-        "z": "fe3a5d18.ca1b6",
+        "x": 550.5980529785156,
+        "y": 268.6691265106201,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "12817250.a42a3e"
+                "beb36a8c.fea37"
             ]
         ]
     },
     {
-        "id": "12f15f6d.9827f1",
+        "id": "5e98bf05.e67a08",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 565.0000190734863,
-        "y": 196.00001049041748,
-        "z": "fe3a5d18.ca1b6",
+        "x": 561.5666847229004,
+        "y": 207.39998722076416,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b500c350.6e3d9"
+                "e784f8c3.fd2c88"
             ]
         ]
     },
     {
-        "id": "b500c350.6e3d9",
+        "id": "e784f8c3.fd2c88",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745,
-        "y": 195,
-        "z": "fe3a5d18.ca1b6",
+        "x": 741.5666656494141,
+        "y": 206.39997673034668,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "805afe4f.d6084"
+                "84d8c37.44581c"
             ]
         ]
     },
     {
-        "id": "805afe4f.d6084",
+        "id": "84d8c37.44581c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 894.4287261962891,
-        "y": 196.14291763305664,
-        "z": "fe3a5d18.ca1b6",
+        "x": 890.9953918457031,
+        "y": 207.54289436340332,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "12817250.a42a3e",
+        "id": "beb36a8c.fea37",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 783.0000152587891,
-        "y": 258.00000619888306,
-        "z": "fe3a5d18.ca1b6",
+        "x": 779.5666809082031,
+        "y": 269.39998292922974,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b6a1534.58369b"
+                "19f2cbd5.f4d47c"
             ]
         ]
     },
     {
-        "id": "b6a1534.58369b",
+        "id": "19f2cbd5.f4d47c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 998,
-        "y": 256,
-        "z": "fe3a5d18.ca1b6",
+        "x": 994.5666656494141,
+        "y": 267.3999767303467,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "3bca8e45.080102"
+                "242d7471.1e0fcc"
             ]
         ]
     },
     {
-        "id": "3bca8e45.080102",
+        "id": "242d7471.1e0fcc",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1162,
-        "y": 251,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1158.566665649414,
+        "y": 262.3999767303467,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "6684c99a.7427e8",
+        "id": "647253ac.fc0934",
         "type": "set",
         "name": "set prop.siteAttachement_length=0",
         "xml": "<set>\n<parameter name='prop.siteAttachements_length' value='0' />\n<parameter name='prop.siteIds_length' value='0' />\n\n\n\n",
         "comments": "",
-        "x": 586.2857360839844,
-        "y": 573.3333435058594,
-        "z": "fe3a5d18.ca1b6",
+        "x": 601.8524169921875,
+        "y": 498.7333679199219,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "2af6c94c.af19e6",
+        "id": "87568bca.067338",
         "type": "for",
         "name": "for vf-modules.vf-module_length",
         "xml": "<for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.0312652587891,
-        "y": 725.531270980835,
-        "z": "fe3a5d18.ca1b6",
+        "x": 596.597900390625,
+        "y": 547.9312744140625,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "27cc261.a1c4eda"
+                "3ffd0e51.14068a"
             ]
         ]
     },
     {
-        "id": "27cc261.a1c4eda",
+        "id": "3ffd0e51.14068a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 741.0312728881836,
-        "y": 802.5312714576721,
-        "z": "fe3a5d18.ca1b6",
+        "x": 806.5979614257812,
+        "y": 548.9312744140625,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "25c1741b.71156c",
-                "f476b4c1.90d488",
-                "38661728.f30148"
+                "d522cd79.ad3f4",
+                "2b00a206.372fbe",
+                "9f0c831.34326"
             ]
         ]
     },
     {
-        "id": "25c1741b.71156c",
+        "id": "d522cd79.ad3f4",
         "type": "switchNode",
         "name": "switch ActivateSDWANDeviceInstance",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1036.0000305175781,
-        "y": 726.0000219345093,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1091.5667190551758,
+        "y": 550.4000248908997,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "d5c6abe5.2055e8"
+                "ad861bc9.52b23"
             ]
         ]
     },
     {
-        "id": "d5c6abe5.2055e8",
+        "id": "ad861bc9.52b23",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1257.999870300293,
-        "y": 725.000020980835,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1313.5665588378906,
+        "y": 549.4000239372253,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "2cf625ba.b60eba"
+                "92c05fd7.57e9c8"
             ]
         ]
     },
     {
-        "id": "2cf625ba.b60eba",
+        "id": "92c05fd7.57e9c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1402.3333740234375,
-        "y": 724.0000219345093,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1457.9000625610352,
+        "y": 548.4000248908997,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "139b09d6.445b26"
+                "cb432e4a.4b0de8"
             ]
         ]
     },
     {
-        "id": "139b09d6.445b26",
+        "id": "cb432e4a.4b0de8",
         "type": "for",
         "name": "for loop didx - Get deviceId from servicedata",
         "xml": "<for index=\"didx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1665.3334197998047,
-        "y": 765.9999008178711,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1721.900146484375,
+        "y": 550.39990234375,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "21359c3d.902a24"
+                "c6c5951b.d1cc6"
             ]
         ]
     },
     {
-        "id": "21359c3d.902a24",
+        "id": "c6c5951b.d1cc6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1594.6663208007812,
-        "y": 849.6666679382324,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1651.2330474853516,
+        "y": 634.0666694641113,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b1f8674.56f5f98"
+                "dd4c1251.6b9dc"
             ]
         ]
     },
     {
-        "id": "b1f8674.56f5f98",
+        "id": "dd4c1251.6b9dc",
         "type": "switchNode",
         "name": "switch name (DeviceName)",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].name == 'name'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1799.3342399597168,
-        "y": 858.0001764297485,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1855.900966644287,
+        "y": 642.4001779556274,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "708fccb5.daf804"
+                "a54c7fdf.cf7748"
             ]
         ]
     },
     {
-        "id": "708fccb5.daf804",
+        "id": "a54c7fdf.cf7748",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2022.3346977233887,
-        "y": 839.0002365112305,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2078.901424407959,
+        "y": 623.4002380371094,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "eb8a8320.4a5de"
+                "e01920aa.1d3f78"
             ]
         ]
     },
     {
-        "id": "eb8a8320.4a5de",
+        "id": "e01920aa.1d3f78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1760.6675491333008,
-        "y": 940.0002403259277,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1817.234275817871,
+        "y": 724.4002418518066,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "f39deed1.3e3c"
+                "491ad5e7.d88bf4"
             ]
         ]
     },
     {
-        "id": "f39deed1.3e3c",
+        "id": "491ad5e7.d88bf4",
         "type": "switchNode",
         "name": "switch deviceName match",
         "xml": "<switch test=\"`$prop.wan.deviceName == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$didx].value`\">\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1966.3342742919922,
-        "y": 941.0003042221069,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2022.9010009765625,
+        "y": 725.4003057479858,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "bb4cb546.fc5c48"
+                "80098fd9.d10308"
             ]
         ]
     },
     {
-        "id": "bb4cb546.fc5c48",
+        "id": "80098fd9.d10308",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1735.668342590332,
-        "y": 1007.0003929138184,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1792.2350692749023,
+        "y": 791.4003944396973,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "f77de57f.61b768"
+                "408c0e84.0ebe98"
             ]
         ]
     },
     {
-        "id": "f77de57f.61b768",
+        "id": "408c0e84.0ebe98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1885.0003128051758,
-        "y": 1012.0001487731934,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1941.567039489746,
+        "y": 796.4001502990723,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "93f703bf.f8f44",
-                "a140338b.f48e2",
-                "a367096a.4c3508"
+                "cda76362.f26248",
+                "c8c067f4.7b7878",
+                "278adaa9.823dce"
             ]
         ]
     },
     {
-        "id": "93f703bf.f8f44",
+        "id": "cda76362.f26248",
         "type": "for",
         "name": "for loop deviceidx - Get deviceId from servicedata",
         "xml": "<for index=\"deviceidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2156.197494506836,
-        "y": 983.0313453674316,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2212.7642211914062,
+        "y": 767.4313468933105,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "16b92c49.0550e4"
+                "ef90e6fe.b8472"
             ]
         ]
     },
     {
-        "id": "a140338b.f48e2",
+        "id": "c8c067f4.7b7878",
         "type": "set",
         "name": "set tmp.devicevidx",
         "xml": "<set>\n<parameter name='tmp.devicevidx' value='`$vfidx`' />\n\n",
         "comments": "",
-        "x": 2073.9994049072266,
-        "y": 1023.0001039505005,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2130.566131591797,
+        "y": 807.4001054763794,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "16b92c49.0550e4",
+        "id": "ef90e6fe.b8472",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2321.1983489990234,
-        "y": 1035.0314292907715,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2377.7650756835938,
+        "y": 819.4314308166504,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "2c030d38.c88f02",
-                "27a33e60.c61c12"
+                "290b2bde.04b43c",
+                "19aa1fcf.94cd28"
             ]
         ]
     },
     {
-        "id": "2c030d38.c88f02",
+        "id": "290b2bde.04b43c",
         "type": "switchNode",
         "name": "switch deviceId",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].name == 'deviceId'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2336.6680221557617,
-        "y": 1077.6669998168945,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2393.234748840332,
+        "y": 862.0670013427734,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "cfe51c42.c396a"
+                "c140599c.4a564"
             ]
         ]
     },
     {
-        "id": "c2afdbf0.691fd8",
+        "id": "b918da97.d41cb",
         "type": "comment",
         "name": "Get deviceId from device resource created for this service",
         "info": "",
         "comments": "",
-        "x": 2164.333366394043,
-        "y": 908.3332514762878,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2220.9000930786133,
+        "y": 692.7332530021667,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "cfe51c42.c396a",
+        "id": "c140599c.4a564",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2489.6683921813965,
-        "y": 1078.6670770645142,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2546.235118865967,
+        "y": 863.0670785903931,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "c26a319e.7f774"
+                "3da2b7b6.0edbe"
             ]
         ]
     },
     {
-        "id": "c26a319e.7f774",
+        "id": "3da2b7b6.0edbe",
         "type": "set",
         "name": "set prop.wan.deviceId",
         "xml": "<set>\n<parameter name='prop.wan.deviceId' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].value`' />\n",
         "comments": "",
-        "x": 2658.6689987182617,
-        "y": 1077.2671117782593,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2715.235725402832,
+        "y": 861.6671133041382,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "f476b4c1.90d488",
+        "id": "2b00a206.372fbe",
         "type": "switchNode",
         "name": "switch ActivateSiteInstance",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`\">\n\n    \n\n",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`\">\n\n    \n\n",
         "comments": "",
         "outputs": 1,
-        "x": 989.6666870117188,
-        "y": 786.666690826416,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1045.2333755493164,
+        "y": 611.0666937828064,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b3e07a22.de09f8"
+                "5764d81.58e5728"
             ]
         ]
     },
     {
-        "id": "b3e07a22.de09f8",
+        "id": "5764d81.58e5728",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1183.666862487793,
-        "y": 785.6667108535767,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1239.2335510253906,
+        "y": 610.066713809967,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b9aff3fc.b88e"
+                "dc9d979a.5f2cd"
             ]
         ]
     },
     {
-        "id": "b9aff3fc.b88e",
+        "id": "dc9d979a.5f2cd",
         "type": "set",
         "name": "set tmp.siteVidx",
         "xml": "<set>\n<parameter name='tmp.siteVidx' value='`$vfidx`' />\n<parameter name='ctx.site.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].`' />",
         "comments": "",
-        "x": 1346.6662979125977,
-        "y": 782.666711807251,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1402.2329864501953,
+        "y": 607.0667147636414,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "55e5acbf.fe5b24",
+        "id": "9a1087dc.7cf728",
         "type": "switchNode",
         "name": "switch tmp.wanPortVidx",
         "xml": "<switch test=\"`$tmp.wanPortVidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.0002365112305,
-        "y": 842.0002207756042,
-        "z": "fe3a5d18.ca1b6",
+        "x": 554.56689453125,
+        "y": 643.4001770019531,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "51af758e.d4a8ec"
+                "8b1ad78e.657ac"
             ]
         ]
     },
     {
-        "id": "bf167ea6.f9992",
+        "id": "ce9e8fbf.c64eb8",
         "type": "switchNode",
         "name": "switch tmp.siteVidx",
         "xml": "<switch test=\"`$tmp.siteVidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 551.984489440918,
-        "y": 886.9965887069702,
-        "z": "fe3a5d18.ca1b6",
+        "x": 539.5511474609375,
+        "y": 688.3965449333191,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "d0596a3e.d0abe8"
+                "3a404df0.e435ea"
             ]
         ]
     },
     {
-        "id": "89ecf7ea.f65c78",
+        "id": "46021ece.1d213",
         "type": "switchNode",
         "name": "switch tmp.devicevidx",
         "xml": "<switch test=\"`$tmp.devicevidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 563.651237487793,
-        "y": 931.9965581893921,
-        "z": "fe3a5d18.ca1b6",
+        "x": 551.2178955078125,
+        "y": 733.396514415741,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "46e578eb.e7f2e8"
+                "17a08f2e.392ab1"
             ]
         ]
     },
     {
-        "id": "46e578eb.e7f2e8",
+        "id": "17a08f2e.392ab1",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.0798377990723,
-        "y": 932.5679111480713,
-        "z": "fe3a5d18.ca1b6",
+        "x": 729.6464958190918,
+        "y": 733.9678673744202,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "7c5cc100.4ca9a"
+                "9de45a58.c4c508"
             ]
         ]
     },
     {
-        "id": "d0596a3e.d0abe8",
+        "id": "3a404df0.e435ea",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.4131698608398,
-        "y": 885.5678281784058,
-        "z": "fe3a5d18.ca1b6",
+        "x": 722.9798278808594,
+        "y": 686.9677844047546,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "c0c0caa4.6e3d18"
+                "762e1a6d.f87714"
             ]
         ]
     },
     {
-        "id": "51af758e.d4a8ec",
+        "id": "8b1ad78e.657ac",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 737.4289398193359,
-        "y": 844.5715956687927,
-        "z": "fe3a5d18.ca1b6",
+        "x": 724.9955978393555,
+        "y": 645.9715518951416,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "c3788885.5a3728"
+                "37d9bd3f.0a7402"
             ]
         ]
     },
     {
-        "id": "c3788885.5a3728",
+        "id": "37d9bd3f.0a7402",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"ActivateSDWANPortInstance not found in service-data\" />\n",
         "comments": "",
-        "x": 878.8580017089844,
-        "y": 844.7145147323608,
-        "z": "fe3a5d18.ca1b6",
+        "x": 866.4246597290039,
+        "y": 646.1144709587097,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "c0c0caa4.6e3d18",
+        "id": "762e1a6d.f87714",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"ActivateSiteInstance not found in service-data\" />\n",
         "comments": "",
-        "x": 879.8421325683594,
-        "y": 885.710732460022,
-        "z": "fe3a5d18.ca1b6",
+        "x": 867.4087905883789,
+        "y": 687.1106886863708,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "7c5cc100.4ca9a",
+        "id": "9de45a58.c4c508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"ActivateSDWANDeviceInstance not found in service-data\" />\n",
         "comments": "",
-        "x": 888.508623123169,
-        "y": 931.7109107971191,
-        "z": "fe3a5d18.ca1b6",
+        "x": 876.0752811431885,
+        "y": 733.110867023468,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "e293366.5ca59c8",
+        "id": "5fd7672d.efd348",
         "type": "for",
         "name": "for loop sidx - Get siteId from servicedata",
         "xml": "<for index=\"sidx\" start=\"0\" end=\"`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`\">\n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 628,
-        "y": 996.0000038146973,
-        "z": "fe3a5d18.ca1b6",
+        "x": 615.5666580200195,
+        "y": 797.3999600410461,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "42f26061.cc632"
+                "57a9a39a.d4fa04"
             ]
         ]
     },
     {
-        "id": "42f26061.cc632",
+        "id": "57a9a39a.d4fa04",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 890.0101928710938,
-        "y": 996.6768283843994,
-        "z": "fe3a5d18.ca1b6",
+        "x": 877.5768508911133,
+        "y": 798.0767846107483,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "cb46a81.d18b858"
+                "757fc61f.93222"
             ]
         ]
     },
     {
-        "id": "cb46a81.d18b858",
+        "id": "757fc61f.93222",
         "type": "switchNode",
         "name": "switch siteId",
         "xml": "<switch test=\"`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.0003280639648,
-        "y": 997.0001344680786,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1046.5669860839844,
+        "y": 798.4000906944275,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "a653a5d0.84bc78"
+                "6950422c.cbd75c"
             ]
         ]
     },
     {
-        "id": "a653a5d0.84bc78",
+        "id": "6950422c.cbd75c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1197.0007858276367,
-        "y": 995.0001192092896,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1184.5674438476562,
+        "y": 796.4000754356384,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "53153bf4.922eb4"
+                "e425faf5.c4ed2"
             ]
         ]
     },
     {
-        "id": "53153bf4.922eb4",
+        "id": "e425faf5.c4ed2",
         "type": "set",
         "name": "set prop.wan.siteId",
         "xml": "<set>\n<parameter name='prop.wan.siteId' value='`$ctx.site.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\n\n\n",
         "comments": "",
-        "x": 1361.000820159912,
-        "y": 996.5999727249146,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1348.5674781799316,
+        "y": 797.9999289512634,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "7b2acf1d.5d2c4",
+        "id": "72a6e071.e177a8",
         "type": "execute",
         "name": "execute RestApiCallNode Get token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 611,
-        "y": 1169.3333778381348,
-        "z": "fe3a5d18.ca1b6",
+        "x": 598.5666580200195,
+        "y": 970.7333340644836,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "1d80bee.50bc541",
-                "eb5f900d.dda61"
+                "3e8b4780.c3e7b",
+                "87683e31.3531e8"
             ]
         ]
     },
     {
-        "id": "56ffc8fe.295058",
+        "id": "c5a35f5.403d42",
         "type": "get-resource",
         "name": "get-resource esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 597.0617713928223,
-        "y": 1086.2122583389282,
-        "z": "fe3a5d18.ca1b6",
+        "x": 584.6284294128418,
+        "y": 887.6122145652771,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "2d46ac01.fa3384",
-                "c3235371.70f16",
-                "11a49df.fe69062"
+                "e08ebeb2.23c9c8",
+                "dad13825.dc1af8",
+                "161968de.f90387"
             ]
         ]
     },
     {
-        "id": "2d46ac01.fa3384",
+        "id": "e08ebeb2.23c9c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 832.0618362426758,
-        "y": 1050.212275505066,
-        "z": "fe3a5d18.ca1b6",
+        "x": 819.6284942626953,
+        "y": 851.6122317314148,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "ec636fec.ea999"
+                "e9266da5.edf4d"
             ]
         ]
     },
     {
-        "id": "c3235371.70f16",
+        "id": "dad13825.dc1af8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 834.5527191162109,
-        "y": 1085.7863121032715,
-        "z": "fe3a5d18.ca1b6",
+        "x": 822.1193771362305,
+        "y": 887.1862683296204,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "1b1255b3.3b49aa"
+                "4d64dd3e.65fe1c"
             ]
         ]
     },
     {
-        "id": "11a49df.fe69062",
+        "id": "161968de.f90387",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 829.8857269287109,
-        "y": 1122.11967086792,
-        "z": "fe3a5d18.ca1b6",
+        "x": 817.4523849487305,
+        "y": 923.5196270942688,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "5e1f1c91.441454"
+                "14fd878.e55fbf9"
             ]
         ]
     },
     {
-        "id": "1b1255b3.3b49aa",
+        "id": "4d64dd3e.65fe1c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 980.1241149902344,
-        "y": 1084.0719995498657,
-        "z": "fe3a5d18.ca1b6",
+        "x": 967.6907730102539,
+        "y": 885.4719557762146,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "ec636fec.ea999",
+        "id": "e9266da5.edf4d",
         "type": "set",
         "name": "set controller data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
         "comments": "",
-        "x": 992.5619468688965,
-        "y": 1048.212215423584,
-        "z": "fe3a5d18.ca1b6",
+        "x": 980.128604888916,
+        "y": 849.6121716499329,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "1d80bee.50bc541",
+        "id": "3e8b4780.c3e7b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 846.0001258850098,
-        "y": 1155.333366394043,
-        "z": "fe3a5d18.ca1b6",
+        "x": 833.5667839050293,
+        "y": 956.7333226203918,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "f4c3c5fd.2e8218"
+                "fa15d12b.8abbb"
             ]
         ]
     },
     {
-        "id": "eb5f900d.dda61",
+        "id": "87683e31.3531e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 845.2501258850098,
-        "y": 1190.9762735366821,
-        "z": "fe3a5d18.ca1b6",
+        "x": 832.8167839050293,
+        "y": 992.376229763031,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "e10df217.332b2"
+                "8a7885ae.8c3fd8"
             ]
         ]
     },
     {
-        "id": "e10df217.332b2",
+        "id": "8a7885ae.8c3fd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
         "comments": "",
-        "x": 994.0001335144043,
-        "y": 1191.7263555526733,
-        "z": "fe3a5d18.ca1b6",
+        "x": 981.5667915344238,
+        "y": 993.1263117790222,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "f4c3c5fd.2e8218",
+        "id": "fa15d12b.8abbb",
         "type": "set",
         "name": "set token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
         "comments": "",
-        "x": 988.0001335144043,
-        "y": 1154.3333673477173,
-        "z": "fe3a5d18.ca1b6",
+        "x": 975.5667915344238,
+        "y": 955.7333235740662,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "ed22f7f1.ec7288",
+        "id": "c4f29b01.377588",
         "type": "set",
         "name": "set prop.tenant-id",
         "xml": "<set>\n<parameter name='prop.tenant-id' value='d9511b64-61ae-446e-96a1-6adbff09582c' />\n",
         "comments": "",
-        "x": 552.9999847412109,
-        "y": 1214.6250553131104,
-        "z": "fe3a5d18.ca1b6",
+        "x": 540.5666427612305,
+        "y": 1016.0250115394592,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "fb6cf9c5.202108",
+        "id": "4374ec20.cd7fb4",
         "type": "execute",
         "name": "execute RestApiCallNode Create tenant auth",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v2/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 634.9999961853027,
-        "y": 1256.6249332427979,
-        "z": "fe3a5d18.ca1b6",
+        "x": 622.5666542053223,
+        "y": 1058.0248894691467,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e1f1c91.441454",
+        "id": "14fd878.e55fbf9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
         "comments": "",
-        "x": 983.6582183837891,
-        "y": 1119.5587577819824,
-        "z": "fe3a5d18.ca1b6",
+        "x": 971.2248764038086,
+        "y": 920.9587140083313,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "b2fc342f.6c0b68",
+        "id": "aaf4a45e.8000f",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 496,
-        "y": 1733.999966621399,
-        "z": "fe3a5d18.ca1b6",
+        "x": 499.5666923522949,
+        "y": 1616.3999853134155,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "be4cbaa5.a17bc8",
+        "id": "e1db3a67.9d3d88",
         "type": "set",
         "name": "set prop.wan.transportNetworkId",
         "xml": "<set>\n<parameter name='prop.wan.transportNetworkId' value='`$transportNetworksResp.data.transportNetworks[$tidx].id`' />\n",
         "comments": "",
-        "x": 1450.656608581543,
-        "y": 1367.6559944152832,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1441.223258972168,
+        "y": 1218.0559792518616,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "a3594760.3045f8",
+        "id": "d4c498b3.d479b",
         "type": "switchNode",
         "name": "switch transportNetworkName same",
         "xml": "<switch test=\"`$transportNetworksResp.data.transportNetworks[$tidx].name == $prop.wan.transportNetworkName`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1030.666259765625,
-        "y": 1368.3323431015015,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1021.23291015625,
+        "y": 1218.7323279380798,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "2217267e.e3931a"
+                "a695536e.3aae48"
             ]
         ]
     },
     {
-        "id": "2217267e.e3931a",
+        "id": "a695536e.3aae48",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1243.6657104492188,
-        "y": 1368.3322610855103,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1234.2323608398438,
+        "y": 1218.7322459220886,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "be4cbaa5.a17bc8"
+                "e1db3a67.9d3d88"
             ]
         ]
     },
     {
-        "id": "ab99bc56.03a1f",
+        "id": "3ea2c186.a3bafe",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 817.6660118103027,
-        "y": 1368.9990720748901,
-        "z": "fe3a5d18.ca1b6",
+        "x": 808.2326622009277,
+        "y": 1219.3990569114685,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "a3594760.3045f8"
+                "d4c498b3.d479b"
             ]
         ]
     },
     {
-        "id": "95135039.a60aa",
+        "id": "4fea1987.fd6de8",
         "type": "for",
         "name": "for loop tidx - Get transportNetwork ID",
         "xml": "<for index=\"tidx\" start=\"0\" end=\"`$transportNetworksResp.data.transportNetworks_length`\">\n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 593.6655960083008,
-        "y": 1368.9987926483154,
-        "z": "fe3a5d18.ca1b6",
+        "x": 584.2322463989258,
+        "y": 1219.3987774848938,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "ab99bc56.03a1f"
+                "3ea2c186.a3bafe"
             ]
         ]
     },
     {
-        "id": "bc190905.6bdb08",
+        "id": "efdcb038.cc7768",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1095.6652336120605,
-        "y": 1324.6654443740845,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1086.2318840026855,
+        "y": 1175.0654292106628,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce813dcf.485f7",
+        "id": "7c7050b2.5e82f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Get transport network info rest api\" />\n",
         "comments": "",
-        "x": 1084.66548538208,
-        "y": 1280.6654481887817,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1075.232135772705,
+        "y": 1131.06543302536,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "ee008d39.43008",
+        "id": "a758bd40.1d94d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 942.665153503418,
-        "y": 1281.6654481887817,
-        "z": "fe3a5d18.ca1b6",
+        "x": 933.231803894043,
+        "y": 1132.06543302536,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "ce813dcf.485f7"
+                "7c7050b2.5e82f8"
             ]
         ]
     },
     {
-        "id": "719fe2a2.cae46c",
+        "id": "2520e9c0.37b516",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 938.6652297973633,
-        "y": 1325.6657705307007,
-        "z": "fe3a5d18.ca1b6",
+        "x": 929.2318801879883,
+        "y": 1176.065755367279,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "bc190905.6bdb08"
+                "efdcb038.cc7768"
             ]
         ]
     },
     {
-        "id": "df7c0c81.e6dd8",
+        "id": "1e6767eb.165f58",
         "type": "execute",
         "name": "execute RestApiCallNode get transport network info",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"get\"/>\n<parameter name=\"responsePrefix\" value=\"transportNetworksResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 650.6655883789062,
-        "y": 1330.6659331321716,
-        "z": "fe3a5d18.ca1b6",
+        "x": 641.2322387695312,
+        "y": 1181.06591796875,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "719fe2a2.cae46c",
-                "ee008d39.43008"
+                "2520e9c0.37b516",
+                "a758bd40.1d94d"
             ]
         ]
     },
     {
-        "id": "a9a5c4dd.f02338",
+        "id": "5862d24a.2961c4",
         "type": "save",
         "name": "save sdwan vpn bandwidth configuration in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='bandwidth-history' \n      key='sdwan-bandwidth-policy-id = $prop.bandwidth.bandwidth-policyId' >\n<parameter name=\"sdwan-bandwidth-policy-id\" value=\"`$prop.bandwidth.bandwidth-policyId`\" />\n<parameter name=\"sdwan-bandwidth-policy-name\" value=\"`$prop.bandwidth.bandwidth-policyId`\" />\n<parameter name=\"bandwidth-value\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"bandwidth-change-time\" value=\"`$prop.wan.bandwidth-change-time`\" />\n<parameter name=\"vpn-id\" value=\"`$prop.bandwidth.vpnId`\" />\n<!--parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' /-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 599.7565498352051,
-        "y": 1688.3282527923584,
-        "z": "fe3a5d18.ca1b6",
+        "x": 603.3232421875,
+        "y": 1570.728271484375,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "9a0d6126.e5e05",
-                "7f8d367f.2cb258"
+                "d5941ab4.54903",
+                "f5f1e715.54f9b8"
             ]
         ]
     },
     {
-        "id": "565469d0.7320a8",
+        "id": "45255c46.056ca4",
         "type": "for",
         "name": "for loop bwidx -input-parameters",
         "xml": "<for index=\"bwidx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 568.0937576293945,
-        "y": 1508.6650838851929,
-        "z": "fe3a5d18.ca1b6",
+        "x": 572.6604423522949,
+        "y": 1381.065131187439,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "fe4d7e03.7b0c7"
+                "4ac42fe3.4e6828"
             ]
         ]
     },
     {
-        "id": "fe4d7e03.7b0c7",
+        "id": "4ac42fe3.4e6828",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804.0945892333984,
-        "y": 1507.665246963501,
-        "z": "fe3a5d18.ca1b6",
+        "x": 808.6612739562988,
+        "y": 1380.065294265747,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "7f4a05af.27429c",
-                "67d8e067.207d7"
+                "6913905f.eaac88",
+                "106821b2.664aee"
             ]
         ]
     },
     {
-        "id": "7f4a05af.27429c",
+        "id": "6913905f.eaac88",
         "type": "switchNode",
         "name": "switch bandwidth",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$bwidx].name == 'bandwidth'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 990.563835144043,
-        "y": 1504.3006629943848,
-        "z": "fe3a5d18.ca1b6",
+        "x": 995.1305198669434,
+        "y": 1376.7007102966309,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "27845d4d.df4892"
+                "267718b3.35416"
             ]
         ]
     },
     {
-        "id": "27845d4d.df4892",
+        "id": "267718b3.35416",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1156.5641689300537,
-        "y": 1501.3008270263672,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1161.130853652954,
+        "y": 1373.7008743286133,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "7318bc58.3a78f4"
+                "8eef17cf.1cf068"
             ]
         ]
     },
     {
-        "id": "7318bc58.3a78f4",
+        "id": "8eef17cf.1cf068",
         "type": "set",
         "name": "set prop.wan.inputBandwidth & outputBandwidth",
         "xml": "<set>\n<parameter name='prop.wan.inputBandwidth' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$bwidx].value`' />\n<parameter name='prop.wan.outputBandwidth' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$bwidx].value`' />\n",
         "comments": "",
-        "x": 1419.564826965332,
-        "y": 1499.9009237289429,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1424.1315116882324,
+        "y": 1372.300971031189,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "67d8e067.207d7",
+        "id": "106821b2.664aee",
         "type": "switchNode",
         "name": "switch bandwidth",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$bwidx].name == 'bandwidth-change-time'`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 993.3692321777344,
-        "y": 1542.3316974639893,
-        "z": "fe3a5d18.ca1b6",
+        "x": 997.9359169006348,
+        "y": 1414.7317447662354,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "d3e4fb8e.757688"
+                "b5bd2ffc.b730a8"
             ]
         ]
     },
     {
-        "id": "d3e4fb8e.757688",
+        "id": "b5bd2ffc.b730a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1159.3695659637451,
-        "y": 1539.3318614959717,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1163.9362506866455,
+        "y": 1411.7319087982178,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "dad668dd.f97bc8"
+                "8a7a213b.3c97e8"
             ]
         ]
     },
     {
-        "id": "dad668dd.f97bc8",
+        "id": "8a7a213b.3c97e8",
         "type": "set",
         "name": "set prop.wan.bandwidth-change-time",
         "xml": "<set>\n<parameter name='prop.wan.bandwidth-change-time' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$bwidx].value`' />\n\n",
         "comments": "",
-        "x": 1393.370246887207,
-        "y": 1537.9320068359375,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1397.9369316101074,
+        "y": 1410.3320541381836,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "9a0d6126.e5e05",
+        "id": "d5941ab4.54903",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 863.0359802246094,
-        "y": 1664.9988250732422,
-        "z": "fe3a5d18.ca1b6",
+        "x": 866.6026725769043,
+        "y": 1547.3988437652588,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "2fb60b95.3ca614"
+                "c9155d20.3eb07"
             ]
         ]
     },
     {
-        "id": "7f8d367f.2cb258",
+        "id": "f5f1e715.54f9b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.0359802246094,
-        "y": 1698.9988269805908,
-        "z": "fe3a5d18.ca1b6",
+        "x": 861.6026725769043,
+        "y": 1581.3988456726074,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "9bc825b2.9d6228"
+                "e2622fc0.5939a8"
             ]
         ]
     },
     {
-        "id": "2fb60b95.3ca614",
+        "id": "c9155d20.3eb07",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1015.0359840393066,
-        "y": 1661.9988255500793,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1018.6026763916016,
+        "y": 1544.398844242096,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d629a7b.45bc64",
+        "id": "3c5dd58c.8a71c2",
         "type": "execute",
         "name": "execute generate-vnf-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.bandwidth.bandwidth-policyId\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 540.1652374267578,
-        "y": 1647.998661994934,
-        "z": "fe3a5d18.ca1b6",
+        "x": 543.7319297790527,
+        "y": 1530.3986806869507,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "9bc825b2.9d6228",
+        "id": "e2622fc0.5939a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"Falied to add AAI bandwidth history record\" />\n",
         "comments": "",
-        "x": 1007.1652164459229,
-        "y": 1698.9988269805908,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1010.7319087982178,
+        "y": 1581.3988456726074,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "d4773b75.f02ff8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1423.831729888916,
-        "y": 1618.6653962135315,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "654cee32.d9b47",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1419.8355903625488,
-        "y": 1584.169144153595,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "496f73f1.608cec",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1279.831714630127,
-        "y": 1619.6655592918396,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            [
-                "d4773b75.f02ff8"
-            ]
-        ]
-    },
-    {
-        "id": "93a36b7f.6e1e08",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1275.831745147705,
-        "y": 1585.6654524803162,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            [
-                "654cee32.d9b47"
-            ]
-        ]
-    },
-    {
-        "id": "62263572.725b3c",
-        "type": "execute",
-        "name": "execute RestApiCallNode wan port update",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1012.8321380615234,
-        "y": 1594.6657781600952,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            [
-                "496f73f1.608cec",
-                "93a36b7f.6e1e08"
-            ]
-        ]
-    },
-    {
-        "id": "e76d9029.37f13",
-        "type": "switchNode",
-        "name": "switch prop.wanPortUpdate null",
-        "xml": "<switch test=\"`$prop.wanPortUpdate`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 558.1964721679688,
-        "y": 1594.696870803833,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            [
-                "125755f3.b6968a"
-            ]
-        ]
-    },
-    {
-        "id": "125755f3.b6968a",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 770.1965560913086,
-        "y": 1595.1965408325195,
-        "z": "fe3a5d18.ca1b6",
-        "wires": [
-            [
-                "62263572.725b3c"
-            ]
-        ]
-    },
-    {
-        "id": "1e1aff6a.3deca1",
+        "id": "f01e536c.bb0ae",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 911.6554641723633,
-        "y": 1470.9890832901,
-        "z": "fe3a5d18.ca1b6",
+        "x": 916.2221488952637,
+        "y": 1343.3891305923462,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "abee6b5b.1a5908",
+        "id": "5f1a4be7.1831d4",
         "type": "set",
         "name": "set ipAddress prefixLength",
         "xml": "<set>\n<parameter name='prop.wan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.wan.prefixLength' value='`$ipandMask[1]`' />",
         "comments": "",
-        "x": 953.6554718017578,
-        "y": 1430.9890804290771,
-        "z": "fe3a5d18.ca1b6",
+        "x": 958.2221565246582,
+        "y": 1303.3891277313232,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "24145b24.9d1724",
+        "id": "356c08ca.858ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 756.6554565429688,
-        "y": 1473.9890842437744,
-        "z": "fe3a5d18.ca1b6",
+        "x": 761.2221412658691,
+        "y": 1346.3891315460205,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "1e1aff6a.3deca1"
+                "f01e536c.bb0ae"
             ]
         ]
     },
     {
-        "id": "621ae9dc.5f21b8",
+        "id": "e29752cc.b1057",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 756.6554527282715,
-        "y": 1432.9890804290771,
-        "z": "fe3a5d18.ca1b6",
+        "x": 761.2221374511719,
+        "y": 1305.3891277313232,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "abee6b5b.1a5908"
+                "5f1a4be7.1831d4"
             ]
         ]
     },
     {
-        "id": "1a81feba.045cb1",
+        "id": "8f8f069f.d3b5f",
         "type": "execute",
         "name": "execute split ip and mask",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.wan.ipAddress`'/>\n<parameter name=\"regex\" value=\"/\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"ipandMask\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 555.6554336547852,
-        "y": 1454.989089012146,
-        "z": "fe3a5d18.ca1b6",
+        "x": 560.2221183776855,
+        "y": 1327.389136314392,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "24145b24.9d1724",
-                "621ae9dc.5f21b8"
+                "356c08ca.858ea",
+                "e29752cc.b1057"
             ]
         ]
     },
     {
-        "id": "beaaef8c.a4de5",
+        "id": "47c6aebc.f1b69",
         "type": "comment",
         "name": "Create wan port",
         "info": "",
         "comments": "",
-        "x": 519.6653251647949,
-        "y": 1407.999002456665,
-        "z": "fe3a5d18.ca1b6",
+        "x": 524.2320098876953,
+        "y": 1280.3990497589111,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "c837b6d8.71b3e8",
+        "id": "ea46891e.885df8",
         "type": "comment",
         "name": "TODO: split ip/mask",
         "info": "",
         "comments": "",
-        "x": 943.6651191711426,
-        "y": 1393.1692161560059,
-        "z": "fe3a5d18.ca1b6",
+        "x": 948.231803894043,
+        "y": 1265.569263458252,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "aaddefb8.d63d3",
+        "id": "8263e11d.eced28",
         "type": "comment",
         "name": "Get network id",
         "info": "",
         "comments": "",
-        "x": 604.6652145385742,
-        "y": 1294.9988594055176,
-        "z": "fe3a5d18.ca1b6",
+        "x": 595.2318649291992,
+        "y": 1145.398844242096,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "38661728.f30148",
+        "id": "9f0c831.34326",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic111.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 945.0000343322754,
-        "y": 683.0000123977661,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1000.566722869873,
+        "y": 507.4000153541565,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "27a33e60.c61c12",
+        "id": "19aa1fcf.94cd28",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic113.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].name`'/>\n<parameter name=\"field3\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$deviceidx].value`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2473.00008392334,
-        "y": 1019.0000581741333,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2529.56681060791,
+        "y": 803.4000597000122,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "a367096a.4c3508",
+        "id": "278adaa9.823dce",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic112.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"tmp.devicevidx\"/>\n<parameter name=\"field3\" value='`$tmp.devicevidx`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2028.000057220459,
-        "y": 1074.0000247955322,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2084.5667839050293,
+        "y": 858.4000263214111,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "483c2153.d1795",
+        "id": "f68778bd.a5e7e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1254.4840850830078,
-        "y": 485.00001335144043,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1261.050765991211,
+        "y": 450.4000053405762,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "600f472e.25ba58"
+                "8eebd9f0.5af1d8"
             ]
         ]
     },
     {
-        "id": "abbfdee9.6a6e5",
+        "id": "68d0b699.a0397",
         "type": "switchNode",
         "name": "switch ActivateSDWANPortInstance",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANPortInstance'`\">\n\n    \n    \n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1034.7699279785156,
-        "y": 483.5715036392212,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1041.3366088867188,
+        "y": 448.97149562835693,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "483c2153.d1795"
+                "f68778bd.a5e7e"
             ]
         ]
     },
     {
-        "id": "c4affd66.4dfb2",
+        "id": "10208096.b0748f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 797.9841156005859,
-        "y": 484.0000114440918,
-        "z": "fe3a5d18.ca1b6",
+        "x": 804.5507965087891,
+        "y": 449.40000343322754,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "abbfdee9.6a6e5"
+                "68d0b699.a0397"
             ]
         ]
     },
     {
-        "id": "23f3a49a.a36dac",
+        "id": "5a004830.6f6608",
         "type": "for",
         "name": "for each existing vf-index",
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 569.4841003417969,
-        "y": 477.9999713897705,
-        "z": "fe3a5d18.ca1b6",
+        "x": 576.05078125,
+        "y": 453.39996337890625,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "c4affd66.4dfb2"
+                "10208096.b0748f"
             ]
         ]
     },
     {
-        "id": "fbf16bc4.9feaf8",
+        "id": "8800c891.1aaf5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 853.0000228881836,
-        "y": 386.222261428833,
-        "z": "fe3a5d18.ca1b6",
+        "x": 849.5666885375977,
+        "y": 397.6222381591797,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "5652c210.116cdc"
+                "fa1fe2ce.2a535"
             ]
         ]
     },
     {
-        "id": "325ec5e8.8f682a",
+        "id": "34c4a2e.64014de",
         "type": "switchNode",
         "name": "switch vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 617,
-        "y": 332.2222456638701,
-        "z": "fe3a5d18.ca1b6",
+        "x": 613.5666656494141,
+        "y": 343.6222223942168,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "49412102.9496d",
-                "e27deb32.e1e6a8",
-                "fbf16bc4.9feaf8"
+                "33f1e3b3.90eed4",
+                "395a4d10.df2e0a",
+                "8800c891.1aaf5"
             ]
         ]
     },
     {
-        "id": "49412102.9496d",
+        "id": "33f1e3b3.90eed4",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.4840364456177,
-        "y": 303.99997469829395,
-        "z": "fe3a5d18.ca1b6",
+        "x": 855.0507020950317,
+        "y": 315.39995142864063,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b39cde31.8ce66"
+                "bb38fd5b.c750d"
             ]
         ]
     },
     {
-        "id": "e27deb32.e1e6a8",
+        "id": "395a4d10.df2e0a",
         "type": "other",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 860.5152254104614,
-        "y": 341.0312857334502,
-        "z": "fe3a5d18.ca1b6",
+        "x": 857.0818910598755,
+        "y": 352.4312624637969,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "b39cde31.8ce66"
+                "bb38fd5b.c750d"
             ]
         ]
     },
     {
-        "id": "b39cde31.8ce66",
+        "id": "bb38fd5b.c750d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-operation-input.vf-module-request-input.vf-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1018.2927408218384,
-        "y": 321.92023417400196,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1014.8594064712524,
+        "y": 333.32021090434864,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "5652c210.116cdc",
+        "id": "fa1fe2ce.2a535",
         "type": "set",
         "name": "set vf-module-length",
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
         "comments": "",
-        "x": 1038.6666259765625,
-        "y": 368,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1035.2332916259766,
+        "y": 379.3999767303467,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "600f472e.25ba58",
+        "id": "8eebd9f0.5af1d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1428.0313301086426,
-        "y": 462.03124907566234,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1407.5980224609375,
+        "y": 449.43121337890625,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "a6912dc8.5986c",
-                "2acae3d9.7f09cc",
-                "83a5b820.78ba98",
-                "b1b5a247.70dba"
+                "ad2f75c.b666408",
+                "737c6127.28b5f8",
+                "e5fe7bc8.c4621",
+                "63f7d78f.5a87f"
             ]
         ]
     },
     {
-        "id": "a6912dc8.5986c",
+        "id": "ad2f75c.b666408",
         "type": "set",
         "name": "set tmp.wanPortVidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.wanPortVidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
+        "xml": "<set>\n<parameter name='tmp.wanPortVidx' value='`$idx`' />\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
         "comments": "",
-        "x": 1704.9180221557617,
-        "y": 430.37367010116577,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1679.4847412109375,
+        "y": 405.7736511230469,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "2acae3d9.7f09cc",
+        "id": "737c6127.28b5f8",
         "type": "set",
         "name": "set vf-module-request-input.",
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
         "comments": "",
-        "x": 1677.3642578125,
-        "y": 475.0313091278076,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1640.930908203125,
+        "y": 451.4312744140625,
+        "z": "a5dd4528.5be69",
         "wires": []
     },
     {
-        "id": "83a5b820.78ba98",
+        "id": "e5fe7bc8.c4621",
         "type": "call",
         "name": "call sdwan-get-wan-param",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1664.660732269287,
-        "y": 523.8709006602876,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1641.2274169921875,
+        "y": 500.2708740234375,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
     },
     {
-        "id": "be34f62e.f9bdf8",
-        "type": "switchNode",
-        "name": "switch vf-modules.vf-module_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
+        "id": "63f7d78f.5a87f",
+        "type": "record",
+        "name": "record",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic121.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"tmp.wanPortVidx\"/>\n<parameter name=\"field3\" value='`$tmp.wanPortVidx`'/>\n<parameter name=\"field4\" value=\"wan port i/p param len\"/>\n<parameter name=\"field5\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 463.03125,
-        "y": 1964.53125,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1590.5980224609375,
+        "y": 361.43121337890625,
+        "z": "a5dd4528.5be69",
         "wires": [
-            [
-                "52c232df.5401dc"
-            ]
+            []
         ]
     },
     {
-        "id": "52c232df.5401dc",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "728a8fb2.b98e98",
+        "type": "comment",
+        "name": "no bandwidth resource in AAI, not required to add",
+        "info": "",
+        "comments": "",
+        "x": 837.75,
+        "y": 1512.75,
+        "z": "a5dd4528.5be69",
+        "wires": []
+    },
+    {
+        "id": "3576832.1dfbb7c",
+        "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%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 699.031268119812,
-        "y": 2037.5312375728972,
-        "z": "fe3a5d18.ca1b6",
+        "x": 565.5,
+        "y": 398.75,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ae8b2331.d9b508",
+        "type": "call",
+        "name": "call sdwan-get-tenant-auth",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 565.5,
+        "y": 1106.25,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "83f66961.dd8d88",
+        "type": "for",
+        "name": "for loop idx - VF-module input parameters",
+        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 569.75,
+        "y": 1463,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "cadc484c.8b1958"
+                "262c400c.36b75"
             ]
         ]
     },
     {
-        "id": "cadc484c.8b1958",
+        "id": "262c400c.36b75",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 843.3883123397827,
-        "y": 2037.4677495663054,
-        "z": "fe3a5d18.ca1b6",
+        "x": 813.6459541320801,
+        "y": 1461.9219717979431,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "4c365aae.126754",
-                "d7b1d5a0.b2f338",
-                "cd28ccaa.a0cb3"
+                "736b2f2f.c714a"
             ]
         ]
     },
     {
-        "id": "cd28ccaa.a0cb3",
-        "type": "set",
-        "name": "set prop.site.deviceId_length",
-        "xml": "<set>\n<parameter name='prop.site.deviceId_length' value='0' />\n",
-        "comments": "",
-        "x": 1065.515284538269,
-        "y": 1988.3089876174927,
-        "z": "fe3a5d18.ca1b6",
-        "wires": []
-    },
-    {
-        "id": "d7b1d5a0.b2f338",
-        "type": "set",
-        "name": "set vf-module-length",
-        "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n\n",
+        "id": "736b2f2f.c714a",
+        "type": "switchNode",
+        "name": "switch IPMode",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`\">\n",
         "comments": "",
-        "x": 1039.086916923523,
-        "y": 2024.0868644714355,
-        "z": "fe3a5d18.ca1b6",
-        "wires": []
+        "outputs": 1,
+        "x": 961.7631988525391,
+        "y": 1463.8954553604126,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "e274d175.2bfe3"
+            ]
+        ]
     },
     {
-        "id": "4c365aae.126754",
-        "type": "for",
-        "name": "for each existing vf-index",
-        "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",
+        "id": "e274d175.2bfe3",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1052.5152921676636,
-        "y": 2060.308978051413,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1109.76318359375,
+        "y": 1460.895420074463,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "d0642297.f75c7"
+                "93ac81ca.d92568"
             ]
         ]
     },
     {
-        "id": "d0642297.f75c7",
+        "id": "93ac81ca.d92568",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1354.0153493881226,
-        "y": 2031.3090119655244,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1266.75,
+        "y": 1462.7777709960938,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "1f9b5508.732aeb"
+                "6eea0f00.2e929",
+                "f7782c28.07206"
             ]
         ]
     },
     {
-        "id": "1f9b5508.732aeb",
+        "id": "6eea0f00.2e929",
         "type": "switchNode",
-        "name": "switch vf-module-id found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
+        "name": "switch IPMode Static match",
+        "xml": "<switch test=\"`Static == $prop.wan.IPMode`\">\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1484.4169921875,
+        "y": 1444.778076171875,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "eaece4a3.1d5c88"
+            ]
+        ]
+    },
+    {
+        "id": "f7782c28.07206",
+        "type": "switchNode",
+        "name": "switch IPMode DHCP match",
+        "xml": "<switch test=\"`DHCP == $prop.wan.IPMode`\">\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1484.7501602172852,
+        "y": 1500.7780017852783,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "7472742.b32b58c"
+            ]
+        ]
+    },
+    {
+        "id": "7472742.b32b58c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1560.8011465072632,
-        "y": 2027.880497932434,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1672.4168395996094,
+        "y": 1499.0001697540283,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "199c63ad.ad4b1c"
+                "4526059b.1e387c"
             ]
         ]
     },
     {
-        "id": "199c63ad.ad4b1c",
+        "id": "eaece4a3.1d5c88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1764.5153875350952,
-        "y": 2026.3090043361299,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1673.4168434143066,
+        "y": 1445.000165939331,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "4cd80296.71966c"
+                "80b151f8.e82f1"
             ]
         ]
     },
     {
-        "id": "4cd80296.71966c",
+        "id": "80b151f8.e82f1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1934.8586835861206,
-        "y": 2030.3951397235505,
-        "z": "fe3a5d18.ca1b6",
+        "x": 1839.9128112792969,
+        "y": 1412.3334267735481,
+        "z": "a5dd4528.5be69",
         "wires": [
             [
-                "cab6ed40.1a967",
-                "30158b6d.c639f4",
-                "a23128b1.823648"
+                "f08d9ab2.8ed8e",
+                "c873d25a.755608"
             ]
         ]
     },
     {
-        "id": "cab6ed40.1a967",
-        "type": "set",
-        "name": "set tmp.vidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",
+        "id": "4526059b.1e387c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1835.9128112792969,
+        "y": 1516.3334267735481,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "baee4a0f.d707e8",
+                "f153c1be.8bc498"
+            ]
+        ]
+    },
+    {
+        "id": "c873d25a.755608",
+        "type": "execute",
+        "name": "execute RestApiCallNode wan port create",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
-        "x": 2185.745337486267,
-        "y": 2000.7375526428223,
-        "z": "fe3a5d18.ca1b6",
-        "wires": []
+        "outputs": 1,
+        "x": 2101.448211669922,
+        "y": 1435.4117959141731,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "723a7671.6415b",
+                "dab4448b.24761"
+            ]
+        ]
     },
     {
-        "id": "30158b6d.c639f4",
-        "type": "set",
-        "name": "set vf-module-request-input.",
-        "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",
+        "id": "dab4448b.24761",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
-        "x": 2180.1916341781616,
-        "y": 2045.395192652475,
-        "z": "fe3a5d18.ca1b6",
-        "wires": []
+        "outputs": 1,
+        "x": 2393.4480361938477,
+        "y": 1454.4113025665283,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "7474d383.13c1a4"
+            ]
+        ]
     },
     {
-        "id": "a23128b1.823648",
-        "type": "call",
-        "name": "call sdwan-get-wan-param",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-wan-param' mode='sync' >\n",
+        "id": "723a7671.6415b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2171.488085746765,
-        "y": 2092.2347913081758,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2391.447956085205,
+        "y": 1501.4114656448364,
+        "z": "a5dd4528.5be69",
         "wires": [
-            []
+            [
+                "cffa333a.efac6"
+            ]
         ]
     },
     {
-        "id": "b1b5a247.70dba",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic121.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"tmp.wanPortVidx\"/>\n<parameter name=\"field3\" value='`$tmp.wanPortVidx`'/>\n<parameter name=\"field4\" value=\"wan port i/p param len\"/>\n<parameter name=\"field5\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'/>\n",
+        "id": "cffa333a.efac6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1615.0313711166382,
-        "y": 378.03124713897705,
-        "z": "fe3a5d18.ca1b6",
+        "x": 2560.4479637145996,
+        "y": 1501.411302447319,
+        "z": "a5dd4528.5be69",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "7474d383.13c1a4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2553.4517860412598,
+        "y": 1452.915044784546,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "a381f3c1.8fd548"
+            ]
+        ]
+    },
+    {
+        "id": "f08d9ab2.8ed8e",
+        "type": "set",
+        "name": "set IP params",
+        "xml": "<set>\n<parameter name='prop.wan.IpMode' value=\"static\" />\n<parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />\n<parameter name='prop.route.nextHopType' value=\"ip-address\" />\n\n\n",
+        "comments": "",
+        "x": 2024.2052917480469,
+        "y": 1384.2327187657356,
+        "z": "a5dd4528.5be69",
+        "wires": []
+    },
+    {
+        "id": "baee4a0f.d707e8",
+        "type": "set",
+        "name": "set IP params",
+        "xml": "<set>\n<parameter name='prop.wan.ipAddress' value=\"\" />\n<parameter name='prop.wan.prefixLength' value=\"\" />\n<parameter name='prop.wan.providerIpAddress' value=\"\" />\n<parameter name='prop.wan.IpMode' value=\"DHCP\" />\n<parameter name='prop.route.nextHopType' value=\"outbound-interface\" />\n\n\n\n",
+        "comments": "",
+        "x": 2021.6669616699219,
+        "y": 1498.3334267735481,
+        "z": "a5dd4528.5be69",
+        "wires": []
+    },
+    {
+        "id": "f153c1be.8bc498",
+        "type": "execute",
+        "name": "execute RestApiCallNode wan port create",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port-dhcp.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2103.912811279297,
+        "y": 1538.3334267735481,
+        "z": "a5dd4528.5be69",
+        "wires": [
+            [
+                "dab4448b.24761",
+                "723a7671.6415b"
+            ]
+        ]
+    },
+    {
+        "id": "a381f3c1.8fd548",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create wan port rest api\" />\n",
+        "comments": "",
+        "x": 2732.448371887207,
+        "y": 1455.411301612854,
+        "z": "a5dd4528.5be69",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
index fb782ada..c1f8931e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
@@ -14,11 +14,15 @@
                 </outcome>
             </execute>
             <set>
-                <parameter name="request-id" value="`$tmp.return.generate.pnf-se-serv-uuid`"/>
+                <parameter name="cds" value="execution-service_process."/>
+                <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.pnf-se-serv-uuid`"/>
                 <parameter name="resource-type" value="`$pnf-topology-operation-input.pnf-details.pnf-type`" />
-                <parameter name="resource-id" value="`$pnf-topology-operation-input.pnf-details.pnf-id`" />
-                <parameter name="action-name" value="resource-assignment"/>
+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$pnf-topology-operation-input.pnf-details.pnf-id`" />
+                <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
                 <parameter name="responsePrefix" value="raAssign" />
+                <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+                <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+                <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
             </set>
             <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`'>
                 <outcome value=''>
@@ -94,29 +98,26 @@
                 <parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '&quot;pnf-model-customization-uuid&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '&quot;pnf-id&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.pnf-id + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $pnf-topology-operation-input.pnf-request-input.aic-cloud-region + '&quot;'`"/>
+            </set>
+            <set>
                 <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload7 + '}'`" />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+                <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />
+                <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
             </set>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
                 <parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
             </record>
-            <execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>
-                <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />
-                <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />
-                <parameter name='action' value='`$action-name`' />
-                <parameter name='mode' value='sync' />
-                <parameter name='force' value='false' />
-                <parameter name='ttl' value='0' />
-                <parameter name='prefix' value='`$responsePrefix`' />
-                <parameter name='payload' value="`'{
-  &quot;resource-assignment-request&quot;: {
-    &quot;template-prefix&quot;: [
-      &quot;' + $tmp.sdnc-artifact-name + '&quot;
-    ],
-    &quot;resource-assignment-properties&quot;: 
-        ' + $tmp.json-payload + '
-  }
-}'`"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
+                <parameter name='restapiUser' value='`$prop.cds.user`' />
+                <parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='POST' />
+                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                <parameter name="responsePrefix" value="`$responsePrefix`" />
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index 1553f977..a2fa9417 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
@@ -14,11 +14,15 @@
                 </outcome>
             </execute>
             <set>
-                <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
+                <parameter name="cds" value="execution-service_process."/>
+                <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
                 <parameter name="resource-type" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-type`" />
-                <parameter name="resource-id" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
-                <parameter name="action-name" value="resource-assignment"/>
+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
+                <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
                 <parameter name="responsePrefix" value="raAssign" />
+                <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+                <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+                <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
             </set>
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>
                 <outcome value=''>
@@ -119,29 +123,26 @@
                 <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload8" value="`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload9" value="`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`"/>
-                <parameter name="tmp.config-name-value-payload91" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
+            </set>
+            <set>
+                <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+                <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />
+                <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
             </set>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
                 <parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
             </record>
-            <execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest' >
-                <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />
-                <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />
-                <parameter name='action' value='`$action-name`' />
-                <parameter name='mode' value='sync' />
-                <parameter name='force' value='false' />
-                <parameter name='ttl' value='0' />
-                <parameter name='prefix' value='`$responsePrefix`' />
-                <parameter name='payload' value="`'{
-  &quot;resource-assignment-request&quot;: {
-    &quot;template-prefix&quot;: [
-      &quot;' + $tmp.vf-module-label + '&quot;
-    ],
-    &quot;resource-assignment-properties&quot;: 
-        ' + $tmp.config-name-value-payload91 + '
-  }
-}'`"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
+                <parameter name='restapiUser' value='`$prop.cds.user`' />
+                <parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='POST' />
+                <parameter name="responsePrefix" value="`$responsePrefix`" />
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
index 2834e11f..b279626a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
@@ -14,11 +14,15 @@
                 </outcome>
             </execute>
             <set>
-                <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
+                <parameter name="cds" value="execution-service_process."/>
+                <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
                 <parameter name="resource-type" value="`$vnf-topology-operation-input.vnf-information.vnf-type`" />
-                <parameter name="resource-id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
-                <parameter name="action-name" value="resource-assignment"/>
+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
+                <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
                 <parameter name="responsePrefix" value="raAssign" />
+                <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+                <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+                <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
             </set>
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>
                 <outcome value=''>
@@ -94,29 +98,26 @@
                 <parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`"/>
+            </set>
+            <set>
                 <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload7 + '}'`" />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+                <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />
+                <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
             </set>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
                 <parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
             </record>
-            <execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>
-                <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />
-                <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />
-                <parameter name='action' value='`$action-name`' />
-                <parameter name='mode' value='sync' />
-                <parameter name='force' value='false' />
-                <parameter name='ttl' value='0' />
-                <parameter name='prefix' value='`$responsePrefix`' />
-                <parameter name='payload' value="`'{
-  &quot;resource-assignment-request&quot;: {
-    &quot;template-prefix&quot;: [
-      &quot;' + $tmp.sdnc-artifact-name + '&quot;
-    ],
-    &quot;resource-assignment-properties&quot;: 
-        ' + $tmp.json-payload + '
-  }
-}'`"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
+                <parameter name='restapiUser' value='`$prop.cds.user`' />
+                <parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='POST' />
+                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                <parameter name="responsePrefix" value="`$responsePrefix`" />
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index e2e986fa..24863d44 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -1,6 +1,6 @@
 <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='GENERIC-RESOURCE-API' version='${project.version}'>
+    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='GENERIC-RESOURCE-API' version='${project.version}'>
     <method rpc='vf-module-topology-operation' mode='sync'>
         <block atomic="true">
             <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
@@ -116,6 +116,18 @@
                         </switch>
                     </block>
                 </outcome>
+                <outcome value='update'>
+                    <block atomic="true">
+                        <switch test='`$vf-module-topology-operation-input.request-information.request-action`'>
+                            <outcome value='SdwanBandwidthChange'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='Other'>
+                                <block></block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.xml
index 8653689c..3774e0c1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-bandwidth-policy-change.xml
@@ -42,6 +42,10 @@
                     </set>
                 </outcome>
             </switch>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
             <for index='idx' start='0' end='`$vf-module-length`' >
                 <block atomic="true">
                     <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.request-information.request-action == 'ActivateSDWANPortInstance'`">
@@ -57,6 +61,7 @@
                                 </record>
                                 <set>
                                     <parameter name='tmp.wanPortVidx' value='`$idx`' />
+                                    <parameter name='tmp.vidx' value='`$idx`' />
                                     <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />
                                 </set>
                                 <set>
@@ -128,7 +133,7 @@
                             </block>
                         </outcome>
                     </switch>
-                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSiteInstance'`">
+                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">
                         <outcome value='true'>
                             <set>
                                 <parameter name='tmp.siteVidx' value='`$vfidx`' />
@@ -176,23 +181,57 @@
                     </switch>
                 </block>
             </for>
-            <set>
-                <parameter name='prop.tenant-id' value='d9511b64-61ae-446e-96a1-6adbff09582c' />
-            </set>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                <outcome value='success'>
+                    <set>
+                        <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                        <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                        <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                    </set>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                    </return>
+                </outcome>
+            </get-resource>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v2/baseservice/tenants/authorization/' + $prop.tenant-id`" />
-                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
                 <parameter name="format" value="json"/>
-                <parameter name="httpMethod" value="put"/>
-                <parameter name="responsePrefix" value="tenant-result"/>
+                <parameter name="httpMethod" value="post"/>
+                <parameter name="responsePrefix" value="token-result"/>
                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                 <parameter name="trustStorePassword" value="adminadmin"/>
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
                 <parameter name="keyStorePassword" value="adminadmin"/>
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                <outcome value='success'>
+                    <set>
+                        <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+                    </set>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error executing get token rest api" />
+                    </return>
+                </outcome>
             </execute>
+            <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`" />
                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
@@ -263,51 +302,92 @@
                     </switch>
                 </block>
             </for>
-            <switch test="`$prop.wanPortUpdate`">
-                <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port.json'`" />
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <parameter name="format" value="json"/>
-                        <parameter name="httpMethod" value="put"/>
-                        <parameter name="responsePrefix" value="wanPortResp"/>
-                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                        <parameter name="trustStorePassword" value="adminadmin"/>
-                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                        <parameter name="keyStorePassword" value="adminadmin"/>
-                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                        <outcome value='failure'>
-                            <block atomic="true"></block>
-                        </outcome>
-                        <outcome value='success'>
-                            <block atomic="true"></block>
+            <for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`'>
+                <block>
+                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`">
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <switch test="`Static == $prop.wan.IPMode`">
+                                    <outcome value='true'>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name='prop.wan.IpMode' value="static" />
+                                                <parameter name='prop.wan.ipAddress' value='`$prop.wan.ip-address`' />
+                                                <parameter name='prop.route.nextHopType' value="ip-address" />
+                                            </set>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-static.json'`" />
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="put"/>
+                                                <parameter name="responsePrefix" value="wanPortResp"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                <outcome value='failure'>
+                                                    <block atomic="true">
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="Error executing Create wan port rest api" />
+                                                        </return>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true"></block>
+                                                </outcome>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <switch test="`DHCP == $prop.wan.IPMode`">
+                                    <outcome value='true'>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name='prop.wan.ipAddress' value="" />
+                                                <parameter name='prop.wan.prefixLength' value="" />
+                                                <parameter name='prop.wan.providerIpAddress' value="" />
+                                                <parameter name='prop.wan.IpMode' value="DHCP" />
+                                                <parameter name='prop.route.nextHopType' value="outbound-interface" />
+                                            </set>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-wan-port-dhcp.json'`" />
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="put"/>
+                                                <parameter name="responsePrefix" value="wanPortResp"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                <outcome value='failure'>
+                                                    <block atomic="true">
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="Error executing Create wan port rest api" />
+                                                        </return>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true"></block>
+                                                </outcome>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </block>
                         </outcome>
-                    </execute>
-                </outcome>
-            </switch>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="prop.bandwidth.bandwidth-policyId"/>
-            </execute>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='bandwidth-history' 
-      key='sdwan-bandwidth-policy-id = $prop.bandwidth.bandwidth-policyId' >
-                <parameter name="sdwan-bandwidth-policy-id" value="`$prop.bandwidth.bandwidth-policyId`" />
-                <parameter name="sdwan-bandwidth-policy-name" value="`$prop.bandwidth.bandwidth-policyId`" />
-                <parameter name="bandwidth-value" value="`$prop.wan.inputBandwidth`" />
-                <parameter name="bandwidth-change-time" value="`$prop.wan.bandwidth-change-time`" />
-                <parameter name="vpn-id" value="`$prop.bandwidth.vpnId`" />
-                <!--parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' /><parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' /><parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' /-->
-                <outcome value='success'>
-                    <block atomic="true"></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='error-code' value='' />
-                        <parameter name='error-message' value="Falied to add AAI bandwidth history record" />
-                    </return>
-                </outcome>
-            </save>
+                    </switch>
+                </block>
+            </for>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/restconfapi-yang/src/main/yang/cds/execution-service.yang b/platform-logic/restconfapi-yang/src/main/yang/cds/execution-service.yang
new file mode 100644
index 00000000..d7cf68f1
--- /dev/null
+++ b/platform-logic/restconfapi-yang/src/main/yang/cds/execution-service.yang
@@ -0,0 +1,43 @@
+module execution-service {
+    yang-version 1.1;
+    namespace "cds:workflow:rest";
+    prefix "cds";
+
+    revision "2019-05-21";
+
+    container process {
+        container commonHeader {
+            leaf originatorId {
+                type string;
+            }
+            leaf requestId {
+                type string;
+            }
+            leaf subRequestId {
+                type string;
+            }
+        }
+        container actionIdentifiers {
+            leaf blueprintName {
+                type string;
+            }
+            leaf blueprintVersion {
+                type string;
+            }
+            leaf actionName {
+                type string;
+            }
+            leaf mode {
+                type string;
+            }
+        }
+        container payload {
+            leaf-list template-prefix {
+                type string;
+            }
+            container resource-assignment-request {
+                anyxml resource-assignment-properties;
+            }
+        }
+    }
+}