27 files changed, 10193 insertions, 5761 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.json
new file mode 100644
index 00000000..7a244462
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.json
@@ -0,0 +1,605 @@
+[
+    {
+        "id": "44848463.9c03cc",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 142.85713958740234,
+        "y": 84.91365146636963,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "f14302be.ebaf1"
+            ]
+        ]
+    },
+    {
+        "id": "f14302be.ebaf1",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 257.1428451538086,
+        "y": 125.15176296234131,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "153fc0f1.cb87df"
+            ]
+        ]
+    },
+    {
+        "id": "153fc0f1.cb87df",
+        "type": "method",
+        "name": "method pnf-topology-operation-unassign",
+        "xml": "<method rpc='pnf-topology-operation-unassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 265.00006103515625,
+        "y": 177.7707920074463,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "b956be40.069de"
+            ]
+        ]
+    },
+    {
+        "id": "99b1e8a8.435958",
+        "type": "comment",
+        "name": "pnf-topology-operation-unassign",
+        "info": "",
+        "comments": "",
+        "x": 618.6305541992188,
+        "y": 65.35713768005371,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "b8803272.ab828",
+        "type": "switchNode",
+        "name": "switch request-action",
+        "xml": "<switch test='`$pnf-topology-operation-input.request-information.request-action`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 547.2738151550293,
+        "y": 312.52079010009766,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "dc693389.c0655",
+                "1ad46da6.a11c82"
+            ]
+        ]
+    },
+    {
+        "id": "dc693389.c0655",
+        "type": "outcome",
+        "name": "DeletePnfInstance",
+        "xml": "<outcome value='DeletePnfInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 767.6547508239746,
+        "y": 287.99699878692627,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "67e9ef57.3e2e3"
+            ]
+        ]
+    },
+    {
+        "id": "1ad46da6.a11c82",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 729.6547164916992,
+        "y": 333.7113265991211,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "3d7b589b.6788d8"
+            ]
+        ]
+    },
+    {
+        "id": "67e9ef57.3e2e3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 952.5118789672852,
+        "y": 287.9970283508301,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3d7b589b.6788d8",
+        "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=\"If svc-action is 'unassign' then request-action must be 'DeletePnfInstance'\" />\n",
+        "comments": "",
+        "x": 969.6547241210938,
+        "y": 333.7112846374512,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "b956be40.069de",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 307.0833511352539,
+        "y": 375.7470169067383,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "b8803272.ab828",
+                "472a3863.cadb08"
+            ]
+        ]
+    },
+    {
+        "id": "472a3863.cadb08",
+        "type": "switchNode",
+        "name": "switch pnf_length",
+        "xml": "<switch test='`$service-data.pnfs.pnf_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 535.8333053588867,
+        "y": 431.99701499938965,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "30e6e945.388c56",
+                "db658b73.14d608"
+            ]
+        ]
+    },
+    {
+        "id": "30e6e945.388c56",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 720.4166679382324,
+        "y": 381.33031368255615,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "4eb21415.9f088c"
+            ]
+        ]
+    },
+    {
+        "id": "ac223b7b.327ae8",
+        "type": "for",
+        "name": "for each pnf",
+        "xml": "<for index='idx' start='0' end='`$service-data.pnfs.pnf_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1058.7499885559082,
+        "y": 460.99698543548584,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "863b8b5d.b74bd8"
+            ]
+        ]
+    },
+    {
+        "id": "863b8b5d.b74bd8",
+        "type": "switchNode",
+        "name": "switch this pnf-id == input pnf-id",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$idx].pnf-id == $pnf-topology-operation-input.pnf-details.pnf-id`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1313.7500762939453,
+        "y": 460.66365337371826,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "1a869d86.029822"
+            ]
+        ]
+    },
+    {
+        "id": "1a869d86.029822",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1552.0833625793457,
+        "y": 459.663631439209,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "89db8fa1.fbfb7"
+            ]
+        ]
+    },
+    {
+        "id": "89db8fa1.fbfb7",
+        "type": "set",
+        "name": "set pnf-index",
+        "xml": "<set>\n<parameter name='pnf-index' value='`$idx`' />\n",
+        "comments": "",
+        "x": 1720.4165573120117,
+        "y": 459.66365337371826,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "91f7c5d2.aec7c8",
+        "type": "switchNode",
+        "name": "switch pnf-index",
+        "xml": "<switch test='`$pnf-index`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1068.7499961853027,
+        "y": 528.6636762619019,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "a73b88c1.d4a938",
+                "61ae7a9f.6fa4c4"
+            ]
+        ]
+    },
+    {
+        "id": "a73b88c1.d4a938",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252.0832710266113,
+        "y": 507.99698543548584,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "3f8e107f.398f6"
+            ]
+        ]
+    },
+    {
+        "id": "2f8817c9.6ff968",
+        "type": "for",
+        "name": "for each pnf",
+        "xml": "<for index='idx' start='`$pnf-index + 1`' end='`$service-data.pnfs.pnf_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1840.7474479675293,
+        "y": 816.2073278427124,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "fbaab91f.ad4ac8"
+            ]
+        ]
+    },
+    {
+        "id": "ffb94216.e342d",
+        "type": "comment",
+        "name": "Remove PNF from service data",
+        "info": "",
+        "comments": "",
+        "x": 1192.5489654541016,
+        "y": 874.8146324157715,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "1e58255a.651e5b",
+        "type": "set",
+        "name": "move pnf to remove one",
+        "xml": "<set>\n<parameter name=\"service-data.pnfs.pnf[$tmpidx].\" value=\"$service-data.pnfs.pnf[$idx].\" />\n\t\n",
+        "comments": "",
+        "x": 2229.576835632324,
+        "y": 874.1359367370605,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "360a75d1.d30c7a",
+        "type": "switchNode",
+        "name": "switch pnf_length",
+        "xml": "<switch test='`$service-data.pnfs.pnf_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1269.5051574707031,
+        "y": 823.5368947982788,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "aaa45fd.40e56a",
+                "1dac6983.f86bf6"
+            ]
+        ]
+    },
+    {
+        "id": "aaa45fd.40e56a",
+        "type": "outcome",
+        "name": "1",
+        "xml": "<outcome value='1'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1457.9338836669922,
+        "y": 752.7748603820801,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "5f59c80c.833558"
+            ]
+        ]
+    },
+    {
+        "id": "5f59c80c.833558",
+        "type": "set",
+        "name": "Remove pnfs",
+        "xml": "<set>\n\t<parameter name=\"service-data.pnfs.\" value=\"\"/>\n\n",
+        "comments": "",
+        "x": 1621.6003799438477,
+        "y": 752.774959564209,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "1dac6983.f86bf6",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1458.0290985107422,
+        "y": 898.6796436309814,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "52f2f529.abde7c"
+            ]
+        ]
+    },
+    {
+        "id": "4e1f1b16.7137e4",
+        "type": "set",
+        "name": "set new pnf length",
+        "xml": "<set>\n\t<parameter name=\"service-data.pnfs.pnf_length\" value=\"`$service-data.pnfs.pnf_length - 1`\"/>\n\n\t\n",
+        "comments": "",
+        "x": 1863.1589050292969,
+        "y": 988.548994064331,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "30dd49ff.6bcb66",
+        "type": "set",
+        "name": "Remove the last pnf in the list",
+        "xml": "<set>\n\t<parameter name=\"service-data.pnfs.pnf[$service-data.pnfs.pnf_length - 1].\" value=\"\"/>\n\n",
+        "comments": "",
+        "x": 1900.291259765625,
+        "y": 930.8027439117432,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "52f2f529.abde7c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1623.8384399414062,
+        "y": 898.2034244537354,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "2f8817c9.6ff968",
+                "30dd49ff.6bcb66",
+                "4e1f1b16.7137e4"
+            ]
+        ]
+    },
+    {
+        "id": "13e0a554.21a0db",
+        "type": "call",
+        "name": "call self-serve-pnf-unassign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-unassign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 825.9999084472656,
+        "y": 940.059440612793,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "3f91ac2d.0f5594",
+                "a584b92f.61d548"
+            ]
+        ]
+    },
+    {
+        "id": "3f91ac2d.0f5594",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1065.1784286499023,
+        "y": 1058.88090133667,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "35976213.e5e2de"
+            ]
+        ]
+    },
+    {
+        "id": "35976213.e5e2de",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error while unassigning self-serve  pnf resources with error: '+ $error-message`\" />\n",
+        "comments": "",
+        "x": 1230.749855041504,
+        "y": 1058.523796081543,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "a584b92f.61d548",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1079.7855987548828,
+        "y": 823.7221164703369,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "360a75d1.d30c7a"
+            ]
+        ]
+    },
+    {
+        "id": "3f8e107f.398f6",
+        "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",
+        "comments": "",
+        "x": 1408.7499732971191,
+        "y": 506.99694538116455,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "4eb21415.9f088c",
+        "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",
+        "comments": "",
+        "x": 873.7499656677246,
+        "y": 380.33032417297363,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "db658b73.14d608",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 717.0833854675293,
+        "y": 490.33028984069824,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "417ce772.8c6608"
+            ]
+        ]
+    },
+    {
+        "id": "417ce772.8c6608",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 875.4166221618652,
+        "y": 490.3302993774414,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "ac223b7b.327ae8",
+                "91f7c5d2.aec7c8"
+            ]
+        ]
+    },
+    {
+        "id": "d339953b.0b9398",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 580.773738861084,
+        "y": 940.4612274169922,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "13e0a554.21a0db"
+            ]
+        ]
+    },
+    {
+        "id": "61ae7a9f.6fa4c4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1248.7500686645508,
+        "y": 553.6636695861816,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "d339953b.0b9398"
+            ]
+        ]
+    },
+    {
+        "id": "fbaab91f.ad4ac8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2006.1906929016113,
+        "y": 815.7470827102661,
+        "z": "f1a3b581.3496c8",
+        "wires": [
+            [
+                "dcefa387.6f6e2",
+                "1e58255a.651e5b",
+                "1b980290.5651ad"
+            ]
+        ]
+    },
+    {
+        "id": "dcefa387.6f6e2",
+        "type": "set",
+        "name": "set tmpidx",
+        "xml": "<set>\n<parameter name=\"$tmpidx\" value=\"`$idx - 1`\"/>\n",
+        "comments": "",
+        "x": 2180.190361022949,
+        "y": 756.2707481384277,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    },
+    {
+        "id": "1b980290.5651ad",
+        "type": "set",
+        "name": "erase entry at tmpidx",
+        "xml": "<set>\n<parameter name=\"service-data.pnfs.pnf[$tmpidx].\" value=\"\" />\n\t\n",
+        "comments": "",
+        "x": 2218.333023071289,
+        "y": 814.0803489685059,
+        "z": "f1a3b581.3496c8",
+        "wires": []
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.json
index 12d9839d..e356ae7f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.json
@@ -1 +1,1597 @@
-[{"id":"38132075.accad","type":"dgstart","name":"DGSTART","outputs":1,"x":146.66665649414062,"y":61.666664123535156,"z":"a8a36eb1.da5cb","wires":[["c336bfd5.df004"]]},{"id":"c07d9c2.a64e96","type":"method","name":"self-serve-capability-param-resolution","xml":"<method rpc='self-serve-capability-param-resolution' mode='sync'>","comments":"","outputs":1,"x":255.66664123535156,"y":125.95238590240479,"z":"a8a36eb1.da5cb","wires":[["43333f1c.57e84"]]},{"id":"c336bfd5.df004","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":454.6666564941406,"y":61.666664123535156,"z":"a8a36eb1.da5cb","wires":[["c07d9c2.a64e96"]]},{"id":"43333f1c.57e84","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":177.3809356689453,"y":189.8095245361328,"z":"a8a36eb1.da5cb","wires":[["3b32ea94.de4546","da8d0eec.e0b31"]]},{"id":"5d236dc5.28c664","type":"for","name":"for i in vnf-parameters-data.param[]","xml":"<for silentFailure='true' index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n","comments":"","outputs":1,"x":956.6190795898438,"y":314.6666793823242,"z":"a8a36eb1.da5cb","wires":[["b655cf4b.9dcdd"]]},{"id":"b655cf4b.9dcdd","type":"switchNode","name":"switch capability-name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n","comments":"","outputs":1,"x":1237.7619438171387,"y":315.2381024360657,"z":"a8a36eb1.da5cb","wires":[["f4914b45.007328"]]},{"id":"f4914b45.007328","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1442.7618942260742,"y":314.6666827201843,"z":"a8a36eb1.da5cb","wires":[["f9273a3b.485268"]]},{"id":"d382ad2f.0f0fa","type":"for","name":"for j in resource-key[]","xml":"<for silentFailure='true' index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n","comments":"","outputs":1,"x":1054.0475463867188,"y":454.80953216552734,"z":"a8a36eb1.da5cb","wires":[["fe6e53c2.fd885"]]},{"id":"fe6e53c2.fd885","type":"execute","name":"slistringUtils - check value for $","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n","comments":"","outputs":1,"x":1331.6190338134766,"y":453.8095407485962,"z":"a8a36eb1.da5cb","wires":[["3026cbf0.b32b04"]]},{"id":"3026cbf0.b32b04","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1561.0475463867188,"y":452.80953216552734,"z":"a8a36eb1.da5cb","wires":[["2089872f.dcdcc8"]]},{"id":"26c7ec4b.cf6d84","type":"execute","name":"split resource-resolution-data","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />\n   <parameter name='regex' value='\\$\\{' />\n","comments":"","outputs":1,"x":1397.761947631836,"y":575.380989074707,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"90a2a531.517608","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s1\" value='`$resource-resolution-split[0]`'/>\n   <parameter name=\"tmp.s2.s2\" value=''/>\n   <parameter name=\"tmp.resolved.var.value\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>\n   \n\n","comments":"","x":1335.0476760864258,"y":647.0952568054199,"z":"a8a36eb1.da5cb","wires":[]},{"id":"19cc8c6a.9cd064","type":"execute","name":"split s2","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n","comments":"","outputs":1,"x":1337.0476760864258,"y":718.0952568054199,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"51a3709.8177e9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1717.0476760864258,"y":810.0952568054199,"z":"a8a36eb1.da5cb","wires":[["a2d00508.5f09f8","20734776.4ba718"]]},{"id":"20734776.4ba718","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s2.s2\" value='`$s2[1]`'/>\n   \n\n","comments":"","x":1886.0476760864258,"y":844.0952568054199,"z":"a8a36eb1.da5cb","wires":[]},{"id":"5744a06d.fb8a2","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n","comments":"","x":1711.0476760864258,"y":740.0952568054199,"z":"a8a36eb1.da5cb","wires":[]},{"id":"4678ba57.3d3cc4","type":"execute","name":"concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.s1`' />\n   <parameter name='target' value='`$tmp.resolved.var.value`' />\n   <parameter name='outputPath' value='tmp.result' />\n","comments":"","outputs":1,"x":1328.9047393798828,"y":969.6666779518127,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"1698d8a7.734377","type":"switchNode","name":"switch s2 length","xml":"<switch test='`$s2_length`'>\n","comments":"","outputs":1,"x":1365.0476760864258,"y":782.0952568054199,"z":"a8a36eb1.da5cb","wires":[["d545785.d8c5a88","67ee90d6.ed2f5"]]},{"id":"d545785.d8c5a88","type":"outcome","name":"1","xml":"<outcome value='1'>","comments":"","outputs":1,"x":1551.0476760864258,"y":740.0952568054199,"z":"a8a36eb1.da5cb","wires":[["5744a06d.fb8a2"]]},{"id":"67ee90d6.ed2f5","type":"outcome","name":"2","xml":"<outcome value='2'>","comments":"","outputs":1,"x":1554.0476760864258,"y":811.0952568054199,"z":"a8a36eb1.da5cb","wires":[["51a3709.8177e9"]]},{"id":"a2d00508.5f09f8","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n","comments":"","x":1882.0476760864258,"y":775.0952568054199,"z":"a8a36eb1.da5cb","wires":[]},{"id":"6dfe9858.462688","type":"execute","name":"concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.result`' />\n   <parameter name='target' value='`$tmp.s2.s2`' />\n   <parameter name='outputPath' value='tmp.result' />\n","comments":"","outputs":1,"x":1732.9047393798828,"y":1092.6666779518127,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"f4dd527.c0d02b","type":"switchNode","name":"switch tmp.s2.s2 null","xml":"<switch test=\"`$tmp.s2.s2 == ''`\">\n","comments":"","outputs":1,"x":1375.9047393798828,"y":1061.6666779518127,"z":"a8a36eb1.da5cb","wires":[["3404454c.5e641a","28355807.bda818"]]},{"id":"3404454c.5e641a","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":1577.9047393798828,"y":1028.6666779518127,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"28355807.bda818","type":"other","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1580.9047393798828,"y":1091.6666779518127,"z":"a8a36eb1.da5cb","wires":[["6dfe9858.462688"]]},{"id":"9c9a923d.7bb19","type":"set","name":"set result of resolution","xml":"<set>\n   <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>\n   \n\n","comments":"","x":1376.9047393798828,"y":1122.6666779518127,"z":"a8a36eb1.da5cb","wires":[]},{"id":"75270f68.5e913","type":"for","name":"for cn in vnf-parameters-data.param[]","xml":"<for silentFailure='true' index='cn' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n","comments":"","outputs":1,"x":1422.9047393798828,"y":902.6666779518127,"z":"a8a36eb1.da5cb","wires":[["86f0255a.39da78"]]},{"id":"86f0255a.39da78","type":"switchNode","name":"switch param[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>\n","comments":"","outputs":1,"x":1704.6190795898438,"y":902.0952777862549,"z":"a8a36eb1.da5cb","wires":[["63f64d65.67f964"]]},{"id":"63f64d65.67f964","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1899.6190795898438,"y":902.0952777862549,"z":"a8a36eb1.da5cb","wires":[["5c39dcf7.3dc1a4"]]},{"id":"5c39dcf7.3dc1a4","type":"set","name":"set","xml":"<set>\n   <parameter name='tmp.resolved.var.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].value`'/>\n   \n\n","comments":"","x":2049.6190795898438,"y":902.0952777862549,"z":"a8a36eb1.da5cb","wires":[]},{"id":"2089872f.dcdcc8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1103.9047393798828,"y":514.6666779518127,"z":"a8a36eb1.da5cb","wires":[["26c7ec4b.cf6d84","90a2a531.517608","19cc8c6a.9cd064","1698d8a7.734377","75270f68.5e913","4678ba57.3d3cc4","f4dd527.c0d02b","9c9a923d.7bb19","a25ed728.dd05c8"]]},{"id":"3b32ea94.de4546","type":"switchNode","name":"switch capability-type","xml":"<switch test=\"`$ss.capability-type`\">\n","comments":"","outputs":1,"x":430.6190185546875,"y":256.95238876342773,"z":"a8a36eb1.da5cb","wires":[["95f464ec.61fa08","42a97c25.6c9024"]]},{"id":"95f464ec.61fa08","type":"not-found","name":"vnf","xml":"<outcome value='vnf'>\n","comments":"","outputs":1,"x":621.3332824707031,"y":256.3810043334961,"z":"a8a36eb1.da5cb","wires":[["f5e3f4b3.e93ca8"]]},{"id":"42a97c25.6c9024","type":"not-found","name":"vf-module","xml":"<outcome value='vf-module'>\n","comments":"","outputs":1,"x":640.7618713378906,"y":1281.9524459838867,"z":"a8a36eb1.da5cb","wires":[["1968f235.a1456e"]]},{"id":"45f374cf.bd9c4c","type":"for","name":"for i in vf-parameters-data.param[]","xml":"<for silentFailure='true' index='i' 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":996.1904449462891,"y":1336.5237007141113,"z":"a8a36eb1.da5cb","wires":[["49be268c.a2c728"]]},{"id":"49be268c.a2c728","type":"switchNode","name":"switch capability-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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n","comments":"","outputs":1,"x":1278.190444946289,"y":1336.5237007141113,"z":"a8a36eb1.da5cb","wires":[["56faaf72.2c084"]]},{"id":"56faaf72.2c084","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1485.190444946289,"y":1336.5237007141113,"z":"a8a36eb1.da5cb","wires":[["498a605e.795d9"]]},{"id":"5089ff8e.aad4f","type":"for","name":"for j in respurce-key[]","xml":"<for silentFailure='true' index='j' 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[$i].resource-resolution-data.resource-key_length`' >\n","comments":"","outputs":1,"x":1124.0476684570312,"y":1424.5238571166992,"z":"a8a36eb1.da5cb","wires":[["f0c07df5.5b959"]]},{"id":"f0c07df5.5b959","type":"execute","name":"slistringUtils - check value for $","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$i].resource-resolution-data.resource-key[$j].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n","comments":"","outputs":1,"x":1401.0476684570312,"y":1423.5238571166992,"z":"a8a36eb1.da5cb","wires":[["7c2f743d.18f8bc"]]},{"id":"7c2f743d.18f8bc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1631.0476684570312,"y":1423.5238571166992,"z":"a8a36eb1.da5cb","wires":[["8bf6c63b.85a908"]]},{"id":"45027a82.e46644","type":"execute","name":"split resource-resolution-data","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' 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[$i].resource-resolution-data.resource-key[$j].value`' />\n   <parameter name='regex' value='\\$\\{' />\n","comments":"","outputs":1,"x":1437.3333587646484,"y":1562.3809909820557,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"e2b0f3c5.7545e","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s1\" value='`$resource-resolution-split[0]`'/>\n   <parameter name=\"tmp.s2.s2\" value=''/>\n   <parameter name=\"tmp.resolved.var.value\" 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[$i].resource-resolution-data.resource-key[$j].value`'/>\n   \n\n","comments":"","x":1374.6190490722656,"y":1622.9523296356201,"z":"a8a36eb1.da5cb","wires":[]},{"id":"2d2c2922.5f86f6","type":"execute","name":"split s2","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n","comments":"","outputs":1,"x":1376.6190490722656,"y":1693.9523296356201,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"850c8d89.591a3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1756.6190490722656,"y":1785.9523296356201,"z":"a8a36eb1.da5cb","wires":[["2526c43b.35178c","cac5a2f5.0d5a1"]]},{"id":"cac5a2f5.0d5a1","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s2.s2\" value='`$s2[1]`'/>\n   \n\n","comments":"","x":1925.6190490722656,"y":1819.9523296356201,"z":"a8a36eb1.da5cb","wires":[]},{"id":"4d102ff5.9cba4","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n","comments":"","x":1750.6190490722656,"y":1715.9523296356201,"z":"a8a36eb1.da5cb","wires":[]},{"id":"3ea82f9.dd4e0d","type":"execute","name":"concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.s1`' />\n   <parameter name='target' value='`$tmp.resolved.var.value`' />\n   <parameter name='outputPath' value='tmp.result' />\n","comments":"","outputs":1,"x":1379.9047393798828,"y":1942.6666779518127,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"9e17a20d.92733","type":"switchNode","name":"switch s2 length","xml":"<switch test='`$s2_length`'>\n","comments":"","outputs":1,"x":1404.6190490722656,"y":1757.9523296356201,"z":"a8a36eb1.da5cb","wires":[["e23af0c.b948b1","14fdc731.dfc139"]]},{"id":"e23af0c.b948b1","type":"outcome","name":"1","xml":"<outcome value='1'>","comments":"","outputs":1,"x":1590.6190490722656,"y":1715.9523296356201,"z":"a8a36eb1.da5cb","wires":[["4d102ff5.9cba4"]]},{"id":"14fdc731.dfc139","type":"outcome","name":"2","xml":"<outcome value='2'>","comments":"","outputs":1,"x":1593.6190490722656,"y":1786.9523296356201,"z":"a8a36eb1.da5cb","wires":[["850c8d89.591a3"]]},{"id":"2526c43b.35178c","type":"set","name":"set","xml":"<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n","comments":"","x":1921.6190490722656,"y":1750.9523296356201,"z":"a8a36eb1.da5cb","wires":[]},{"id":"3bf0cd93.76b4a2","type":"execute","name":"concat","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.result`' />\n   <parameter name='target' value='`$tmp.s2.s2`' />\n   <parameter name='outputPath' value='tmp.result' />\n","comments":"","outputs":1,"x":1782.4762268066406,"y":2063.38099861145,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"9fbf2eed.f76d1","type":"switchNode","name":"switch tmp.s2.s2 null","xml":"<switch test=\"`$tmp.s2.s2 == ''`\">\n","comments":"","outputs":1,"x":1426.9047393798828,"y":2034.6666779518127,"z":"a8a36eb1.da5cb","wires":[["dfe12108.3c451","d9e83e57.1f044"]]},{"id":"dfe12108.3c451","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":1627.4762268066406,"y":2000.3809986114502,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"d9e83e57.1f044","type":"other","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1631.4762268066406,"y":2063.38099861145,"z":"a8a36eb1.da5cb","wires":[["3bf0cd93.76b4a2"]]},{"id":"82538112.2772d","type":"set","name":"set result of resolution","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[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>\n   \n\n","comments":"","x":1427.9047393798828,"y":2095.6666779518127,"z":"a8a36eb1.da5cb","wires":[]},{"id":"6d023a73.719b64","type":"for","name":"for cn in vf-parameters-data.param[]","xml":"<for silentFailure='true' index='cn' 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":1467.9047393798828,"y":1875.6666779518127,"z":"a8a36eb1.da5cb","wires":[["d2cfd478.963a98"]]},{"id":"d2cfd478.963a98","type":"switchNode","name":"switch param[].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[$cn].name == $tmp.s2.s1`'>\n","comments":"","outputs":1,"x":1756.9047393798828,"y":1874.6666779518127,"z":"a8a36eb1.da5cb","wires":[["921027a8.5df8e8"]]},{"id":"921027a8.5df8e8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1962.9047393798828,"y":1874.6666779518127,"z":"a8a36eb1.da5cb","wires":[["3fd35702.d39c68"]]},{"id":"3fd35702.d39c68","type":"set","name":"set","xml":"<set>\n   <parameter name='tmp.resolved.var.value' 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[$cn].value`'/>\n   \n\n","comments":"","x":2115.904739379883,"y":1874.6666779518127,"z":"a8a36eb1.da5cb","wires":[]},{"id":"8bf6c63b.85a908","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1154.9047393798828,"y":1487.6666779518127,"z":"a8a36eb1.da5cb","wires":[["45027a82.e46644","e2b0f3c5.7545e","2d2c2922.5f86f6","9e17a20d.92733","6d023a73.719b64","3ea82f9.dd4e0d","9fbf2eed.f76d1","82538112.2772d","f7783fb5.37a6"]]},{"id":"a25ed728.dd05c8","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=\"`'SS: param[].value with leading $: ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n","comments":"","outputs":1,"x":1327.6189498901367,"y":514.0952973365784,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"f7783fb5.37a6","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=\"`'SS: param[].value with leading $: ' + $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[$i].resource-resolution-data.resource-key[$j].value`\"/>\n","comments":"","outputs":1,"x":1364.7618865966797,"y":1487.6666870117188,"z":"a8a36eb1.da5cb","wires":[[]]},{"id":"f5e3f4b3.e93ca8","type":"switchNode","name":"switch param_length null","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`\">\n","comments":"","outputs":1,"x":810.3333129882812,"y":256.6666793823242,"z":"a8a36eb1.da5cb","wires":[["f043a414.c6fb18"]]},{"id":"f043a414.c6fb18","type":"outcome","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1029.3333129882812,"y":255.66667938232422,"z":"a8a36eb1.da5cb","wires":[["5d236dc5.28c664"]]},{"id":"1968f235.a1456e","type":"switchNode","name":"switch param_length null","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":872.3333129882812,"y":1280.6666793823242,"z":"a8a36eb1.da5cb","wires":[["ef022e86.c8ea3"]]},{"id":"ef022e86.c8ea3","type":"outcome","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1073.3333129882812,"y":1279.6666793823242,"z":"a8a36eb1.da5cb","wires":[["45f374cf.bd9c4c"]]},{"id":"f9273a3b.485268","type":"switchNode","name":"switch resource-key_length null","xml":"<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length == ''`\">\n","comments":"","outputs":1,"x":990.3333129882812,"y":383.6666793823242,"z":"a8a36eb1.da5cb","wires":[["1569720b.1b48de"]]},{"id":"1569720b.1b48de","type":"outcome","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1209.3333129882812,"y":382.6666793823242,"z":"a8a36eb1.da5cb","wires":[["d382ad2f.0f0fa"]]},{"id":"498a605e.795d9","type":"switchNode","name":"switch resource-key_length null","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[$i].resource-resolution-data.resource-key_length == ''`\">\n","comments":"","outputs":1,"x":1058.3333129882812,"y":1382.6666793823242,"z":"a8a36eb1.da5cb","wires":[["b5361b06.4c14d8"]]},{"id":"b5361b06.4c14d8","type":"outcome","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1277.3333129882812,"y":1381.6666793823242,"z":"a8a36eb1.da5cb","wires":[["5089ff8e.aad4f"]]},{"id":"da8d0eec.e0b31","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: self-serve-capability-param-resolution\"/>","comments":"","outputs":1,"x":339.99997329711914,"y":1501.6665592193604,"z":"a8a36eb1.da5cb","wires":[[]]}]
-\ No newline at end of file
+[
+    {
+        "id": "64991a60.2d1874",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.42857360839844,
+        "y": 52.85714340209961,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "eca08f9.7f2997"
+            ]
+        ]
+    },
+    {
+        "id": "f314ed03.56fff",
+        "type": "method",
+        "name": "self-serve-capability-param-resolution",
+        "xml": "<method rpc='self-serve-capability-param-resolution' mode='sync'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 230.42855834960938,
+        "y": 117.14286518096924,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "e4f17cb2.8e032"
+            ]
+        ]
+    },
+    {
+        "id": "eca08f9.7f2997",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 429.42857360839844,
+        "y": 52.85714340209961,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "f314ed03.56fff"
+            ]
+        ]
+    },
+    {
+        "id": "e4f17cb2.8e032",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 152.14285278320312,
+        "y": 181.00000381469727,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "da983adc.a4dab8",
+                "1880a83d.625878"
+            ]
+        ]
+    },
+    {
+        "id": "308f02bb.a6ac6e",
+        "type": "for",
+        "name": "for i in vnf-parameters-data.param[]",
+        "xml": "<for silentFailure='true' index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 931.3809967041016,
+        "y": 305.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "8b3b6388.bab3d"
+            ]
+        ]
+    },
+    {
+        "id": "8b3b6388.bab3d",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1212.5238609313965,
+        "y": 306.4285817146301,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "401fd60f.a4aab8"
+            ]
+        ]
+    },
+    {
+        "id": "401fd60f.a4aab8",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1417.523811340332,
+        "y": 305.8571619987488,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "38610be3.409204"
+            ]
+        ]
+    },
+    {
+        "id": "bff9b5e8.ac81a8",
+        "type": "for",
+        "name": "for j in resource-key[]",
+        "xml": "<for silentFailure='true' index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1028.8094635009766,
+        "y": 446.0000114440918,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "1f895dbf.62d692"
+            ]
+        ]
+    },
+    {
+        "id": "1f895dbf.62d692",
+        "type": "execute",
+        "name": "slistringUtils - check value for $",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1306.3809509277344,
+        "y": 445.00002002716064,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "3f1ef9ba.a53286"
+            ]
+        ]
+    },
+    {
+        "id": "3f1ef9ba.a53286",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1535.8094635009766,
+        "y": 444.0000114440918,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "2711da37.da2c26"
+            ]
+        ]
+    },
+    {
+        "id": "76ebcd43.544104",
+        "type": "execute",
+        "name": "split resource-resolution-data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1372.5238647460938,
+        "y": 566.5714683532715,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "215c2247.4e93fe",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s1\" value='`$resource-resolution-split[0]`'/>\n   <parameter name=\"tmp.s2.s2\" value=''/>\n   <parameter name=\"tmp.resolved.var.value\" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>\n   \n\n",
+        "comments": "",
+        "x": 1309.8095932006836,
+        "y": 638.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "b7c90b7.2536ef8",
+        "type": "execute",
+        "name": "split s2",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1311.8095932006836,
+        "y": 709.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "879deeb3.5b9a3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1691.8095932006836,
+        "y": 801.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "7f970ab0.e55384",
+                "48cc5a8d.76a2d4"
+            ]
+        ]
+    },
+    {
+        "id": "48cc5a8d.76a2d4",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s2\" value='`$s2[1]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1860.8095932006836,
+        "y": 835.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "d686a5b2.3e33b8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1685.8095932006836,
+        "y": 731.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "222c512e.2cc11e",
+        "type": "execute",
+        "name": "concat",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.s1`' />\n   <parameter name='target' value='`$tmp.resolved.var.value`' />\n   <parameter name='outputPath' value='tmp.result' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1303.6666564941406,
+        "y": 960.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c576f4f1.73b2a8",
+        "type": "switchNode",
+        "name": "switch s2 length",
+        "xml": "<switch test='`$s2_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1339.8095932006836,
+        "y": 773.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "2289e106.41aefe",
+                "b4881a2.fcff7e8"
+            ]
+        ]
+    },
+    {
+        "id": "2289e106.41aefe",
+        "type": "outcome",
+        "name": "1",
+        "xml": "<outcome value='1'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1525.8095932006836,
+        "y": 731.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "d686a5b2.3e33b8"
+            ]
+        ]
+    },
+    {
+        "id": "b4881a2.fcff7e8",
+        "type": "outcome",
+        "name": "2",
+        "xml": "<outcome value='2'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1528.8095932006836,
+        "y": 802.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "879deeb3.5b9a3"
+            ]
+        ]
+    },
+    {
+        "id": "7f970ab0.e55384",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1856.8095932006836,
+        "y": 766.2857360839844,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "a9f317a7.fd2d38",
+        "type": "execute",
+        "name": "concat",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.result`' />\n   <parameter name='target' value='`$tmp.s2.s2`' />\n   <parameter name='outputPath' value='tmp.result' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1707.6666564941406,
+        "y": 1083.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f52f4d94.0c562",
+        "type": "switchNode",
+        "name": "switch tmp.s2.s2 null",
+        "xml": "<switch test=\"`$tmp.s2.s2 == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1350.6666564941406,
+        "y": 1052.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "e42a1a4a.7d1618",
+                "b1453a81.b9cec8"
+            ]
+        ]
+    },
+    {
+        "id": "e42a1a4a.7d1618",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1552.6666564941406,
+        "y": 1019.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b1453a81.b9cec8",
+        "type": "other",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1555.6666564941406,
+        "y": 1082.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "a9f317a7.fd2d38"
+            ]
+        ]
+    },
+    {
+        "id": "48203350.d17c8c",
+        "type": "set",
+        "name": "set result of resolution",
+        "xml": "<set>\n   <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>\n   \n\n",
+        "comments": "",
+        "x": 1351.6666564941406,
+        "y": 1113.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "fabed139.91b78",
+        "type": "for",
+        "name": "for cn in vnf-parameters-data.param[]",
+        "xml": "<for silentFailure='true' index='cn' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1397.6666564941406,
+        "y": 893.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "4ca4012e.a615d"
+            ]
+        ]
+    },
+    {
+        "id": "4ca4012e.a615d",
+        "type": "switchNode",
+        "name": "switch param[].name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1679.3809967041016,
+        "y": 893.2857570648193,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "fd9449cc.ebeff8"
+            ]
+        ]
+    },
+    {
+        "id": "fd9449cc.ebeff8",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1874.3809967041016,
+        "y": 893.2857570648193,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "c3b0581a.7fc368"
+            ]
+        ]
+    },
+    {
+        "id": "c3b0581a.7fc368",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name='tmp.resolved.var.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].value`'/>\n   \n\n",
+        "comments": "",
+        "x": 2024.3809967041016,
+        "y": 893.2857570648193,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "2711da37.da2c26",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1078.6666564941406,
+        "y": 505.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "76ebcd43.544104",
+                "215c2247.4e93fe",
+                "b7c90b7.2536ef8",
+                "c576f4f1.73b2a8",
+                "fabed139.91b78",
+                "222c512e.2cc11e",
+                "f52f4d94.0c562",
+                "48203350.d17c8c",
+                "44a12bc5.2a4724"
+            ]
+        ]
+    },
+    {
+        "id": "da983adc.a4dab8",
+        "type": "switchNode",
+        "name": "switch capability-type",
+        "xml": "<switch test=\"`$ss.capability-type`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 405.3809356689453,
+        "y": 248.1428680419922,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "3e7d85e.1498e7a",
+                "3bd615d5.c2e45a",
+                "de8eda93.8e0018"
+            ]
+        ]
+    },
+    {
+        "id": "3e7d85e.1498e7a",
+        "type": "not-found",
+        "name": "vnf",
+        "xml": "<outcome value='vnf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 596.0951995849609,
+        "y": 247.57148361206055,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "dad124ab.d34ff8"
+            ]
+        ]
+    },
+    {
+        "id": "3bd615d5.c2e45a",
+        "type": "not-found",
+        "name": "vf-module",
+        "xml": "<outcome value='vf-module'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 615.5237884521484,
+        "y": 1273.1429252624512,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "233e14a6.1568bc"
+            ]
+        ]
+    },
+    {
+        "id": "52358824.3b6ec8",
+        "type": "for",
+        "name": "for i in vf-parameters-data.param[]",
+        "xml": "<for silentFailure='true' index='i' 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": 970.9523620605469,
+        "y": 1327.7141799926758,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "23475e1e.924562"
+            ]
+        ]
+    },
+    {
+        "id": "23475e1e.924562",
+        "type": "switchNode",
+        "name": "switch capability-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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252.9523620605469,
+        "y": 1327.7141799926758,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "62d41158.e379"
+            ]
+        ]
+    },
+    {
+        "id": "62d41158.e379",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1459.9523620605469,
+        "y": 1327.7141799926758,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "fe64eb49.f3acc8"
+            ]
+        ]
+    },
+    {
+        "id": "3aa96efe.6c9112",
+        "type": "for",
+        "name": "for j in respurce-key[]",
+        "xml": "<for silentFailure='true' index='j' 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[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1098.809585571289,
+        "y": 1415.7143363952637,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "9b02a76.de22f58"
+            ]
+        ]
+    },
+    {
+        "id": "9b02a76.de22f58",
+        "type": "execute",
+        "name": "slistringUtils - check value for $",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$i].resource-resolution-data.resource-key[$j].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1375.809585571289,
+        "y": 1414.7143363952637,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "36cd78d3.ee1f58"
+            ]
+        ]
+    },
+    {
+        "id": "36cd78d3.ee1f58",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1605.809585571289,
+        "y": 1414.7143363952637,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "650f24d8.fdc18c"
+            ]
+        ]
+    },
+    {
+        "id": "fb80bd4c.52e33",
+        "type": "execute",
+        "name": "split resource-resolution-data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' 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[$i].resource-resolution-data.resource-key[$j].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1412.0952758789062,
+        "y": 1553.5714702606201,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aa1a7c09.5620e",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s1\" value='`$resource-resolution-split[0]`'/>\n   <parameter name=\"tmp.s2.s2\" value=''/>\n   <parameter name=\"tmp.resolved.var.value\" 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[$i].resource-resolution-data.resource-key[$j].value`'/>\n   \n\n",
+        "comments": "",
+        "x": 1349.3809661865234,
+        "y": 1614.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "e1379e60.5888",
+        "type": "execute",
+        "name": "split s2",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1351.3809661865234,
+        "y": 1685.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5292c959.51edc8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1731.3809661865234,
+        "y": 1777.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "1b5d17c5.b538b8",
+                "bcd431b6.01a15"
+            ]
+        ]
+    },
+    {
+        "id": "bcd431b6.01a15",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s2\" value='`$s2[1]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1900.3809661865234,
+        "y": 1811.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "6a891607.f38828",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1725.3809661865234,
+        "y": 1707.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "b39f4a16.e83c48",
+        "type": "execute",
+        "name": "concat",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.s1`' />\n   <parameter name='target' value='`$tmp.resolved.var.value`' />\n   <parameter name='outputPath' value='tmp.result' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1354.6666564941406,
+        "y": 1933.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "737f578a.7489e8",
+        "type": "switchNode",
+        "name": "switch s2 length",
+        "xml": "<switch test='`$s2_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1379.3809661865234,
+        "y": 1749.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "1ab58139.e5f24f",
+                "5a7ee896.24ee58"
+            ]
+        ]
+    },
+    {
+        "id": "1ab58139.e5f24f",
+        "type": "outcome",
+        "name": "1",
+        "xml": "<outcome value='1'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1565.3809661865234,
+        "y": 1707.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "6a891607.f38828"
+            ]
+        ]
+    },
+    {
+        "id": "5a7ee896.24ee58",
+        "type": "outcome",
+        "name": "2",
+        "xml": "<outcome value='2'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1568.3809661865234,
+        "y": 1778.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "5292c959.51edc8"
+            ]
+        ]
+    },
+    {
+        "id": "1b5d17c5.b538b8",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1896.3809661865234,
+        "y": 1742.1428089141846,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "25e9d73.ea72528",
+        "type": "execute",
+        "name": "concat",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.result`' />\n   <parameter name='target' value='`$tmp.s2.s2`' />\n   <parameter name='outputPath' value='tmp.result' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1757.2381439208984,
+        "y": 2054.5714778900146,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "796dc8b8.7909c8",
+        "type": "switchNode",
+        "name": "switch tmp.s2.s2 null",
+        "xml": "<switch test=\"`$tmp.s2.s2 == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1401.6666564941406,
+        "y": 2025.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "ca725550.cf8348",
+                "1074ef78.1b1671"
+            ]
+        ]
+    },
+    {
+        "id": "ca725550.cf8348",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1602.2381439208984,
+        "y": 1991.5714778900146,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1074ef78.1b1671",
+        "type": "other",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1606.2381439208984,
+        "y": 2054.5714778900146,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "25e9d73.ea72528"
+            ]
+        ]
+    },
+    {
+        "id": "95c5599c.45bd78",
+        "type": "set",
+        "name": "set result of resolution",
+        "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[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>\n   \n\n",
+        "comments": "",
+        "x": 1402.6666564941406,
+        "y": 2086.857157230377,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "306f0267.5482de",
+        "type": "for",
+        "name": "for cn in vf-parameters-data.param[]",
+        "xml": "<for silentFailure='true' index='cn' 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": 1442.6666564941406,
+        "y": 1866.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "2aa6c8a8.7fc5d8"
+            ]
+        ]
+    },
+    {
+        "id": "2aa6c8a8.7fc5d8",
+        "type": "switchNode",
+        "name": "switch param[].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[$cn].name == $tmp.s2.s1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1731.6666564941406,
+        "y": 1865.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "c5eb5a8.478d7a8"
+            ]
+        ]
+    },
+    {
+        "id": "c5eb5a8.478d7a8",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1937.6666564941406,
+        "y": 1865.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "34f5f75.a74d308"
+            ]
+        ]
+    },
+    {
+        "id": "34f5f75.a74d308",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name='tmp.resolved.var.value' 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[$cn].value`'/>\n   \n\n",
+        "comments": "",
+        "x": 2090.6666564941406,
+        "y": 1865.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "650f24d8.fdc18c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1129.6666564941406,
+        "y": 1478.8571572303772,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "fb80bd4c.52e33",
+                "aa1a7c09.5620e",
+                "e1379e60.5888",
+                "737f578a.7489e8",
+                "306f0267.5482de",
+                "b39f4a16.e83c48",
+                "796dc8b8.7909c8",
+                "95c5599c.45bd78",
+                "d05339df.4c2038"
+            ]
+        ]
+    },
+    {
+        "id": "44a12bc5.2a4724",
+        "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=\"`'SS: param[].value with leading $: ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1302.3808670043945,
+        "y": 505.2857766151428,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d05339df.4c2038",
+        "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=\"`'SS: param[].value with leading $: ' + $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[$i].resource-resolution-data.resource-key[$j].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1339.5238037109375,
+        "y": 1478.8571662902832,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "dad124ab.d34ff8",
+        "type": "switchNode",
+        "name": "switch param_length null",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 785.0952301025391,
+        "y": 247.85715866088867,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "c76f0689.dd2ec8"
+            ]
+        ]
+    },
+    {
+        "id": "c76f0689.dd2ec8",
+        "type": "outcome",
+        "name": "false",
+        "xml": "<outcome value='false'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1004.0952301025391,
+        "y": 246.85715866088867,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "308f02bb.a6ac6e"
+            ]
+        ]
+    },
+    {
+        "id": "233e14a6.1568bc",
+        "type": "switchNode",
+        "name": "switch param_length null",
+        "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": 847.0952301025391,
+        "y": 1271.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "53ad520c.5dbc8c"
+            ]
+        ]
+    },
+    {
+        "id": "53ad520c.5dbc8c",
+        "type": "outcome",
+        "name": "false",
+        "xml": "<outcome value='false'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1048.095230102539,
+        "y": 1270.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "52358824.3b6ec8"
+            ]
+        ]
+    },
+    {
+        "id": "38610be3.409204",
+        "type": "switchNode",
+        "name": "switch resource-key_length null",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 965.0952301025391,
+        "y": 374.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "961b4f5c.7ee6b"
+            ]
+        ]
+    },
+    {
+        "id": "961b4f5c.7ee6b",
+        "type": "outcome",
+        "name": "false",
+        "xml": "<outcome value='false'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1184.095230102539,
+        "y": 373.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "bff9b5e8.ac81a8"
+            ]
+        ]
+    },
+    {
+        "id": "fe64eb49.f3acc8",
+        "type": "switchNode",
+        "name": "switch resource-key_length null",
+        "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[$i].resource-resolution-data.resource-key_length == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1033.095230102539,
+        "y": 1373.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "f04736fc.959cd8"
+            ]
+        ]
+    },
+    {
+        "id": "f04736fc.959cd8",
+        "type": "outcome",
+        "name": "false",
+        "xml": "<outcome value='false'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252.095230102539,
+        "y": 1372.8571586608887,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "3aa96efe.6c9112"
+            ]
+        ]
+    },
+    {
+        "id": "1880a83d.625878",
+        "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: self-serve-capability-param-resolution\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 314.76189041137695,
+        "y": 1492.8570384979248,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "57975b44.aeea74",
+        "type": "for",
+        "name": "for i in pnf-parameters-data.param[]",
+        "xml": "<for silentFailure='true' index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 938.7142944335938,
+        "y": 2378.571533203125,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "484630de.2f8b2"
+            ]
+        ]
+    },
+    {
+        "id": "484630de.2f8b2",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1219.8571586608887,
+        "y": 2379.1429562568665,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "cb0b2f54.9c535"
+            ]
+        ]
+    },
+    {
+        "id": "cb0b2f54.9c535",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1424.8571090698242,
+        "y": 2378.571536540985,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "4013c370.7dd30c"
+            ]
+        ]
+    },
+    {
+        "id": "3e1aa09f.ad09a",
+        "type": "for",
+        "name": "for j in resource-key[]",
+        "xml": "<for silentFailure='true' index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1036.1427612304688,
+        "y": 2518.714385986328,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "4ce3a043.0d1c8"
+            ]
+        ]
+    },
+    {
+        "id": "4ce3a043.0d1c8",
+        "type": "execute",
+        "name": "slistringUtils - check value for $",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1313.7142486572266,
+        "y": 2517.714394569397,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "c7ffbd4c.6d892"
+            ]
+        ]
+    },
+    {
+        "id": "c7ffbd4c.6d892",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1543.1427612304688,
+        "y": 2516.714385986328,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "ee693b4d.892a08"
+            ]
+        ]
+    },
+    {
+        "id": "f71ce8f1.bc0e68",
+        "type": "execute",
+        "name": "split resource-resolution-data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1379.857162475586,
+        "y": 2639.285842895508,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "880d8f3f.18d9d",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s1\" value='`$resource-resolution-split[0]`'/>\n   <parameter name=\"tmp.s2.s2\" value=''/>\n   <parameter name=\"tmp.resolved.var.value\" value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>\n   \n\n",
+        "comments": "",
+        "x": 1317.1428909301758,
+        "y": 2711.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "27d0611d.c3273e",
+        "type": "execute",
+        "name": "split s2",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1319.1428909301758,
+        "y": 2782.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d159b662.1c3418",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1699.1428909301758,
+        "y": 2874.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "1cad1041.9bc56",
+                "117b4ef5.d4be51"
+            ]
+        ]
+    },
+    {
+        "id": "117b4ef5.d4be51",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s2\" value='`$s2[1]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1868.1428909301758,
+        "y": 2908.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "ab656b8.7358498",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1693.1428909301758,
+        "y": 2804.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "2dcb9176.9538be",
+        "type": "execute",
+        "name": "concat",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.s1`' />\n   <parameter name='target' value='`$tmp.resolved.var.value`' />\n   <parameter name='outputPath' value='tmp.result' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1310.9999542236328,
+        "y": 3033.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ec69a32e.de88a",
+        "type": "switchNode",
+        "name": "switch s2 length",
+        "xml": "<switch test='`$s2_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1347.1428909301758,
+        "y": 2846.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "9faf5c42.32213",
+                "a0833425.948ca8"
+            ]
+        ]
+    },
+    {
+        "id": "9faf5c42.32213",
+        "type": "outcome",
+        "name": "1",
+        "xml": "<outcome value='1'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1533.1428909301758,
+        "y": 2804.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "ab656b8.7358498"
+            ]
+        ]
+    },
+    {
+        "id": "a0833425.948ca8",
+        "type": "outcome",
+        "name": "2",
+        "xml": "<outcome value='2'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1536.1428909301758,
+        "y": 2875.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "d159b662.1c3418"
+            ]
+        ]
+    },
+    {
+        "id": "1cad1041.9bc56",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name=\"tmp.s2.s1\" value='`$s2[0]`'/>\n   \n\n",
+        "comments": "",
+        "x": 1864.1428909301758,
+        "y": 2839.0001106262207,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "4877ec67.f93394",
+        "type": "execute",
+        "name": "concat",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>\n   <parameter name='source' value='`$tmp.result`' />\n   <parameter name='target' value='`$tmp.s2.s2`' />\n   <parameter name='outputPath' value='tmp.result' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1714.9999542236328,
+        "y": 3156.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a98626fd.34ab98",
+        "type": "switchNode",
+        "name": "switch tmp.s2.s2 null",
+        "xml": "<switch test=\"`$tmp.s2.s2 == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1357.9999542236328,
+        "y": 3125.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "d13c76a2.4d4038",
+                "d23a01b0.32246"
+            ]
+        ]
+    },
+    {
+        "id": "d13c76a2.4d4038",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1559.9999542236328,
+        "y": 3092.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d23a01b0.32246",
+        "type": "other",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1562.9999542236328,
+        "y": 3155.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "4877ec67.f93394"
+            ]
+        ]
+    },
+    {
+        "id": "22ce76c6.095f5a",
+        "type": "set",
+        "name": "set result of resolution",
+        "xml": "<set>\n   <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>\n   \n\n",
+        "comments": "",
+        "x": 1358.9999542236328,
+        "y": 3186.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "d2b51d09.31bec",
+        "type": "for",
+        "name": "for cn in pnf-parameters-data.param[]",
+        "xml": "<for silentFailure='true' index='cn' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1404.9999542236328,
+        "y": 2966.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "c5c22c14.716aa"
+            ]
+        ]
+    },
+    {
+        "id": "c5c22c14.716aa",
+        "type": "switchNode",
+        "name": "switch param[].name",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1686.7142944335938,
+        "y": 2966.0001316070557,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "c2232c60.14d6f"
+            ]
+        ]
+    },
+    {
+        "id": "c2232c60.14d6f",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1881.7142944335938,
+        "y": 2966.0001316070557,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "5b165344.b8577c"
+            ]
+        ]
+    },
+    {
+        "id": "5b165344.b8577c",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name='tmp.resolved.var.value' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cn].value`'/>\n   \n\n",
+        "comments": "",
+        "x": 2031.7142944335938,
+        "y": 2966.0001316070557,
+        "z": "f2a4469f.b36fa8",
+        "wires": []
+    },
+    {
+        "id": "ee693b4d.892a08",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1085.9999542236328,
+        "y": 2578.5715317726135,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "f71ce8f1.bc0e68",
+                "880d8f3f.18d9d",
+                "27d0611d.c3273e",
+                "ec69a32e.de88a",
+                "d2b51d09.31bec",
+                "2dcb9176.9538be",
+                "a98626fd.34ab98",
+                "22ce76c6.095f5a",
+                "f0d643f8.6b8dd"
+            ]
+        ]
+    },
+    {
+        "id": "de8eda93.8e0018",
+        "type": "not-found",
+        "name": "pnf",
+        "xml": "<outcome value='pnf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 574.7141265869141,
+        "y": 2320.7145318984985,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "185021f0.20918e"
+            ]
+        ]
+    },
+    {
+        "id": "f0d643f8.6b8dd",
+        "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=\"`'SS: param[].value with leading $: ' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1309.7141647338867,
+        "y": 2578.000151157379,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "185021f0.20918e",
+        "type": "switchNode",
+        "name": "switch param_length null",
+        "xml": "<switch test=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 792.4285278320312,
+        "y": 2320.571533203125,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "df505d4.bc14da"
+            ]
+        ]
+    },
+    {
+        "id": "df505d4.bc14da",
+        "type": "outcome",
+        "name": "false",
+        "xml": "<outcome value='false'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1011.4285278320312,
+        "y": 2319.571533203125,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "57975b44.aeea74"
+            ]
+        ]
+    },
+    {
+        "id": "4013c370.7dd30c",
+        "type": "switchNode",
+        "name": "switch resource-key_length null",
+        "xml": "<switch test=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 972.4285278320312,
+        "y": 2447.571533203125,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "28f3362.c405dca"
+            ]
+        ]
+    },
+    {
+        "id": "28f3362.c405dca",
+        "type": "outcome",
+        "name": "false",
+        "xml": "<outcome value='false'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1191.4285278320312,
+        "y": 2446.571533203125,
+        "z": "f2a4469f.b36fa8",
+        "wires": [
+            [
+                "3e1aa09f.ad09a"
+            ]
+        ]
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.json
index a679b1f5..84646292 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.json
@@ -1,919 +1,352 @@
-[
-    {
-        "id": "1c1b1b8c.f22d8c",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 101,
-        "y": 36,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "5242feba.24d568"
-            ]
-        ]
-    },
-    {
-        "id": "5242feba.24d568",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 377,
-        "y": 37,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "d27cbed.05f55c"
-            ]
-        ]
-    },
-    {
-        "id": "d27cbed.05f55c",
-        "type": "method",
-        "name": "self-serve-generate-name-changeassign",
-        "xml": "<method rpc='self-serve-generate-name-changeassign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 773,
-        "y": 36,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "5dd94280.59f404"
-            ]
-        ]
-    },
-    {
-        "id": "5dd94280.59f404",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 119.5,
-        "y": 119,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "f7b2e52c.493238",
-                "f8d58ab4.c216e",
-                "488f44a1.f47cc4"
-            ]
-        ]
-    },
-    {
-        "id": "488f44a1.f47cc4",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$ss.capability-type`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 365,
-        "y": 450.11114501953125,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "2c48172e.c12508",
-                "33b5a922.c609d6",
-                "7e07a472.6c934c",
-                "b86ad187.19dd28"
-            ]
-        ]
-    },
-    {
-        "id": "2c48172e.c12508",
-        "type": "outcome",
-        "name": "vnf",
-        "xml": "<outcome value='vnf'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 550,
-        "y": 514,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "973953f9.a1f848"
-            ]
-        ]
-    },
-    {
-        "id": "33b5a922.c609d6",
-        "type": "outcome",
-        "name": "vf-module",
-        "xml": "<outcome value='vf-module'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 567.4444580078125,
-        "y": 1362.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "fc92d96a.d71e28"
-            ]
-        ]
-    },
-    {
-        "id": "7e07a472.6c934c",
-        "type": "outcome",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 538.111083984375,
-        "y": 2089.5556030273438,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "6e4fdf25.0d9908"
-            ]
-        ]
-    },
-    {
-        "id": "b86ad187.19dd28",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 541.111083984375,
-        "y": 2159.5556030273438,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "6e4fdf25.0d9908"
-            ]
-        ]
-    },
-    {
-        "id": "6e4fdf25.0d9908",
-        "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=\"capability-type is not vnf or vf-module\" />\n",
-        "comments": "",
-        "x": 726.111083984375,
-        "y": 2119.5556030273438,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "f7b2e52c.493238",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$ss.input.param.index`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 362,
-        "y": 162,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "570568eb.22122"
-            ]
-        ]
-    },
-    {
-        "id": "f8d58ab4.c216e",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$ss.service-data.param.index`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 364,
-        "y": 235,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "b5d6857c.4e6108"
-            ]
-        ]
-    },
-    {
-        "id": "570568eb.22122",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 525,
-        "y": 161,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "efa9a9cc.1d3f18"
-            ]
-        ]
-    },
-    {
-        "id": "b5d6857c.4e6108",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 528,
-        "y": 234,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "7c13efe5.43ea88"
-            ]
-        ]
-    },
-    {
-        "id": "efa9a9cc.1d3f18",
-        "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=\"ss.input.param.index is null\" />\n",
-        "comments": "",
-        "x": 714,
-        "y": 161,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "7c13efe5.43ea88",
-        "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=\"ss.service-data.param.index is null\" />\n",
-        "comments": "",
-        "x": 715,
-        "y": 234,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "776ec9b3.cfe35",
-        "type": "execute",
-        "name": "execute NameGenerationNode-changeassign",
-        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"vnf.changeassign.nameGenResponse\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 839,
-        "y": 829,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "ece4186c.66532",
-                "92f7fa59.72257"
-            ]
-        ]
-    },
-    {
-        "id": "ece4186c.66532",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1080,
-        "y": 784,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "cef19df0.cf597"
-            ]
-        ]
-    },
-    {
-        "id": "92f7fa59.72257",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1085,
-        "y": 882,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "cef19df0.cf597"
-            ]
-        ]
-    },
-    {
-        "id": "cef19df0.cf597",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1237,
-        "y": 826,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "ee51f6c5.2fc7b",
-                "2868a2e7.19a866"
-            ]
-        ]
-    },
-    {
-        "id": "ee51f6c5.2fc7b",
-        "type": "set",
-        "name": "set status as FAILED",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 1438,
-        "y": 774,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "2868a2e7.19a866",
-        "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 NameGenerationNode ChangeAssign vnf ' + $error-message`\" />\n",
-        "comments": "",
-        "x": 1424,
-        "y": 883,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "973953f9.a1f848",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 718,
-        "y": 514,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "e2385750.976298",
-                "924870b0.89a2",
-                "43fb1f27.951ec8",
-                "776ec9b3.cfe35",
-                "cdac6275.62c538",
-                "3d7cf445.7e3e64"
-            ]
-        ]
-    },
-    {
-        "id": "e2385750.976298",
-        "type": "for",
-        "name": "for service-data.vnf-parameters-data.param index i",
-        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 886,
-        "y": 577,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "502bdf23.14a01"
-            ]
-        ]
-    },
-    {
-        "id": "502bdf23.14a01",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1042,
-        "y": 639,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "a82dd4d8.fa645"
-            ]
-        ]
-    },
-    {
-        "id": "a82dd4d8.fa645",
-        "type": "outcome",
-        "name": "external-key",
-        "xml": "<outcome value='external-key'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1228,
-        "y": 639,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "c9562be9.ab781"
-            ]
-        ]
-    },
-    {
-        "id": "c9562be9.ab781",
-        "type": "set",
-        "name": "set tmp.external-key.value",
-        "xml": "<set>\n<parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />\n",
-        "comments": "",
-        "x": 1460,
-        "y": 639,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "43fb1f27.951ec8",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name=\"tmp.vnf.changeassign.naming-data-payload\" value=\"`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`\"/>",
-        "comments": "",
-        "x": 775,
-        "y": 763,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "924870b0.89a2",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$tmp.external-key.value`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 746,
-        "y": 706,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "a1e3a0cf.8001e8"
-            ]
-        ]
-    },
-    {
-        "id": "a1e3a0cf.8001e8",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 899,
-        "y": 705,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "8627e3cd.3b77e8"
-            ]
-        ]
-    },
-    {
-        "id": "8627e3cd.3b77e8",
-        "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=\"self-service-generate-name-changeassign error : external-key is null for vnf\" />\n",
-        "comments": "",
-        "x": 1060,
-        "y": 705,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "89b0826d.ca14b",
-        "type": "execute",
-        "name": "execute NameGenerationNode-changeassign",
-        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"vf-module.changeassign.nameGenResponse\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 897.4444580078125,
-        "y": 1678.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "24cee4e8.4b448c",
-                "75bedfb3.3ade98"
-            ]
-        ]
-    },
-    {
-        "id": "24cee4e8.4b448c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1134.4444580078125,
-        "y": 1632.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "cb648bfb.cf66d8"
-            ]
-        ]
-    },
-    {
-        "id": "75bedfb3.3ade98",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1140.4444580078125,
-        "y": 1732.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "cb648bfb.cf66d8"
-            ]
-        ]
-    },
-    {
-        "id": "cb648bfb.cf66d8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1287.4444580078125,
-        "y": 1674.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "6fbd418e.fb8d9",
-                "a4b1611a.39c14"
-            ]
-        ]
-    },
-    {
-        "id": "6fbd418e.fb8d9",
-        "type": "set",
-        "name": "set status as FAILED",
-        "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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 1496.4444580078125,
-        "y": 1623.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "a4b1611a.39c14",
-        "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 NameGenerationNode ChangeAssign vf-module ' + $error-message`\" />\n",
-        "comments": "",
-        "x": 1482.4444580078125,
-        "y": 1732.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "fc92d96a.d71e28",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 776.4444580078125,
-        "y": 1363.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "c4770fe1.62916",
-                "dd52b043.a96ef",
-                "12397850.e2f698",
-                "89b0826d.ca14b",
-                "352c4756.0206c8",
-                "d93b3d94.b2b228"
-            ]
-        ]
-    },
-    {
-        "id": "c4770fe1.62916",
-        "type": "for",
-        "name": "for service-data.vnf-parameters-data.param index i",
-        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 944.4444580078125,
-        "y": 1426.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "7c7934f8.f11a6c"
-            ]
-        ]
-    },
-    {
-        "id": "7c7934f8.f11a6c",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1098.4444580078125,
-        "y": 1488.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "c6f3adca.93b718"
-            ]
-        ]
-    },
-    {
-        "id": "c6f3adca.93b718",
-        "type": "outcome",
-        "name": "external-key",
-        "xml": "<outcome value='external-key'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1284.4444580078125,
-        "y": 1488.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "be8ee91c.01b38"
-            ]
-        ]
-    },
-    {
-        "id": "be8ee91c.01b38",
-        "type": "set",
-        "name": "set tmp.external-key.value",
-        "xml": "<set>\n<parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />\n",
-        "comments": "",
-        "x": 1516.4444580078125,
-        "y": 1488.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "12397850.e2f698",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name=\"tmp.vf-module.changeassign.naming-data-payload\" value=\"`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`\"/>",
-        "comments": "",
-        "x": 833.4444580078125,
-        "y": 1612.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "dd52b043.a96ef",
-        "type": "switchNode",
-        "name": "switch",
-        "xml": "<switch test='`$tmp.external-key.value`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 804.4444580078125,
-        "y": 1555.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "e401bf03.ed02a8"
-            ]
-        ]
-    },
-    {
-        "id": "e401bf03.ed02a8",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 957.4444580078125,
-        "y": 1554.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "1bd8e3a8.c533b4"
-            ]
-        ]
-    },
-    {
-        "id": "1bd8e3a8.c533b4",
-        "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=\"self-service-generate-name-changeassign error : external-key is null for vf-module\" />\n",
-        "comments": "",
-        "x": 1118.4444580078125,
-        "y": 1554.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "c22afee4.bb0e98",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 890.9999389648438,
-        "y": 948.8888549804688,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "d52d5d8a.20fc58"
-            ]
-        ]
-    },
-    {
-        "id": "d52d5d8a.20fc58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1056.5556640625,
-        "y": 993.4444427490234,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "85e49276.168cd",
-                "f60bf43e.3a4bd8"
-            ]
-        ]
-    },
-    {
-        "id": "85e49276.168cd",
-        "type": "set",
-        "name": "set status as FAILED",
-        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 1266,
-        "y": 949,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "f60bf43e.3a4bd8",
-        "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=\"`'Failed to update generic-vnf.vnf-name to ' + $ss.changeassign.vnf-name + ' in AnAI'`\" />\n",
-        "comments": "",
-        "x": 1254,
-        "y": 1037,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "3d7cf445.7e3e64",
-        "type": "set",
-        "name": "set success",
-        "xml": "<set>\n\t <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].value`' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`'/>\n\t <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />",
-        "comments": "",
-        "x": 688.1111450195312,
-        "y": 1077.8888549804688,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "296de1b7.0fd81e",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 959.111083984375,
-        "y": 1804.1109008789062,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "1a47636d.f18615"
-            ]
-        ]
-    },
-    {
-        "id": "1a47636d.f18615",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1122.4444580078125,
-        "y": 1839.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "13f096ae.130bd9",
-                "446f10ad.05f988"
-            ]
-        ]
-    },
-    {
-        "id": "13f096ae.130bd9",
-        "type": "set",
-        "name": "set status as FAILED",
-        "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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 1337.4444580078125,
-        "y": 1799.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "446f10ad.05f988",
-        "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=\"`'Failed to update vf-module.vf-module-name to ' + $ss.changeassign.vf-module-name + ' in AnAI'`\" />\n",
-        "comments": "",
-        "x": 1325.4444580078125,
-        "y": 1887.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "d93b3d94.b2b228",
-        "type": "set",
-        "name": "set success",
-        "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[$ss.service-data.param.index].value`' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`'/>\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[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />",
-        "comments": "",
-        "x": 788.4444580078125,
-        "y": 1929.777587890625,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "ef964ca0.407bf8",
-        "type": "comment",
-        "name": "For VNF genname changeassign",
-        "info": "",
-        "comments": "",
-        "x": 632.2222290039062,
-        "y": 450.2222595214844,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "2ef4734c.fa35c4",
-        "type": "comment",
-        "name": "For VF-MODULE genname changeassign",
-        "info": "",
-        "comments": "",
-        "x": 667.7777709960938,
-        "y": 1272.444580078125,
-        "z": "cd15d378.222de8",
-        "wires": []
-    },
-    {
-        "id": "cdac6275.62c538",
-        "type": "save",
-        "name": "update generic-vnf",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"generic-vnf\"\n\t\tkey=\"generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id \" >\n<parameter name=\"vnf-name\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 712.22216796875,
-        "y": 990.2222900390625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "c22afee4.bb0e98",
-                "5fc85d40.547644"
-            ]
-        ]
-    },
-    {
-        "id": "352c4756.0206c8",
-        "type": "save",
-        "name": "update vf-module",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \" > \n<parameter name=\"vf-module-name\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 790,
-        "y": 1840.2222900390625,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "296de1b7.0fd81e",
-                "ba968b2c.2f6978"
-            ]
-        ]
-    },
-    {
-        "id": "ba968b2c.2f6978",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 956.6666870117188,
-        "y": 1890.2219848632812,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "1a47636d.f18615"
-            ]
-        ]
-    },
-    {
-        "id": "5fc85d40.547644",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 894.4445190429688,
-        "y": 1039.1111450195312,
-        "z": "cd15d378.222de8",
-        "wires": [
-            [
-                "d52d5d8a.20fc58"
-            ]
-        ]
-    }
+[
+    {
+        "id": "214635e7.c9d7da",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 162.85714721679688,
+        "y": 60,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "7c170e6c.b1f92"
+            ]
+        ]
+    },
+    {
+        "id": "7c170e6c.b1f92",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 438.8571472167969,
+        "y": 61,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "bc54c92c.6660c8"
+            ]
+        ]
+    },
+    {
+        "id": "bc54c92c.6660c8",
+        "type": "method",
+        "name": "self-serve-generate-name-changeassign",
+        "xml": "<method rpc='self-serve-generate-name-changeassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 287.71429443359375,
+        "y": 118.57143115997314,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "2a24a725.3d8af8"
+            ]
+        ]
+    },
+    {
+        "id": "2a24a725.3d8af8",
+        "type": "block",
+        "name": "block atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 345.64286041259766,
+        "y": 292.9999942779541,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "cfd035fd.908608",
+                "16504b6.9600db5",
+                "6ee2e5ff.d456bc",
+                "9f6c60d6.c01e8",
+                "7e866415.d5162c"
+            ]
+        ]
+    },
+    {
+        "id": "6ee2e5ff.d456bc",
+        "type": "switchNode",
+        "name": "switch ss.capability-type",
+        "xml": "<switch test='`$ss.capability-type`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 621.1428527832031,
+        "y": 645.5397043228149,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "d6d95309.fd728",
+                "89c92bcf.b9bd18",
+                "18b4c130.7fafcf"
+            ]
+        ]
+    },
+    {
+        "id": "d6d95309.fd728",
+        "type": "outcome",
+        "name": "vnf",
+        "xml": "<outcome value='vnf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 857.5715103149414,
+        "y": 558.000018119812,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "da068899.c4fcc8"
+            ]
+        ]
+    },
+    {
+        "id": "89c92bcf.b9bd18",
+        "type": "outcome",
+        "name": "vf-module",
+        "xml": "<outcome value='vf-module'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 869.3015823364258,
+        "y": 616.2061395645142,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "79055137.e90c6"
+            ]
+        ]
+    },
+    {
+        "id": "cfd035fd.908608",
+        "type": "switchNode",
+        "name": "switch ss.input.param.index",
+        "xml": "<switch test='`$ss.input.param.index`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 638.1428680419922,
+        "y": 390.28570652008057,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "b355a907.8b4998"
+            ]
+        ]
+    },
+    {
+        "id": "16504b6.9600db5",
+        "type": "switchNode",
+        "name": "switch ss.service-data.param.index",
+        "xml": "<switch test='`$ss.service-data.param.index`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 665.8571624755859,
+        "y": 463.71426486968994,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "212a16ee.89cc4a"
+            ]
+        ]
+    },
+    {
+        "id": "b355a907.8b4998",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 871.1429214477539,
+        "y": 390.7142767906189,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "e955c510.269908"
+            ]
+        ]
+    },
+    {
+        "id": "212a16ee.89cc4a",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 908.4286270141602,
+        "y": 463.71426916122437,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "2955cf32.c355c"
+            ]
+        ]
+    },
+    {
+        "id": "e955c510.269908",
+        "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=\"ss.input.param.index is null\" />\n",
+        "comments": "",
+        "x": 1060.142921447754,
+        "y": 390.7142767906189,
+        "z": "5d6511ad.296e1",
+        "wires": []
+    },
+    {
+        "id": "2955cf32.c355c",
+        "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=\"ss.service-data.param.index is null\" />\n",
+        "comments": "",
+        "x": 1095.4286270141602,
+        "y": 463.71426916122437,
+        "z": "5d6511ad.296e1",
+        "wires": []
+    },
+    {
+        "id": "c215d7d9.0f6ee8",
+        "type": "outcome",
+        "name": "pnf",
+        "xml": "<outcome value='pnf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 852.8571586608887,
+        "y": 674.2857217788696,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "5357c55f.7049cc"
+            ]
+        ]
+    },
+    {
+        "id": "18b4c130.7fafcf",
+        "type": "outcome",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 852.8254013061523,
+        "y": 729.2698307037354,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "1774b158.13d70f"
+            ]
+        ]
+    },
+    {
+        "id": "1774b158.13d70f",
+        "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=\"`'Unknown capability-type [' + $ss.capability-type + '], valid value are: vnf, pnf, vf-module'`\" />\n",
+        "comments": "",
+        "x": 1039.3967819213867,
+        "y": 729.2698259353638,
+        "z": "5d6511ad.296e1",
+        "wires": []
+    },
+    {
+        "id": "da068899.c4fcc8",
+        "type": "call",
+        "name": "call self-serve-vnf-generate-name-changeassign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name-changeassign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1154.2858581542969,
+        "y": 558.1428499221802,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "79055137.e90c6",
+        "type": "call",
+        "name": "call self-serve-vf-module-generate-name-changeassign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name-changeassign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1203.3930702209473,
+        "y": 615.9285726547241,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5357c55f.7049cc",
+        "type": "call",
+        "name": "call self-serve-pnf-generate-name-changeassign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-generate-name-changeassign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1155.0001258850098,
+        "y": 673.7143020629883,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7e866415.d5162c",
+        "type": "call",
+        "name": "call capability-param-resolution",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 651.4284973144531,
+        "y": 320.00001335144043,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "84c93cbb.6b991",
+        "type": "execute",
+        "name": "execute PropertiesNode",
+        "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": 1042.1070763724192,
+        "y": 250.28571564810636,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9f6c60d6.c01e8",
+        "type": "switchNode",
+        "name": "switch prop.controller.user",
+        "xml": "<switch test='`$prop.controller.user`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 630.8213119506836,
+        "y": 250.71433639526367,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "beb3f038.e55c8"
+            ]
+        ]
+    },
+    {
+        "id": "beb3f038.e55c8",
+        "type": "failure",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 830.6784073965891,
+        "y": 250.28575093405607,
+        "z": "5d6511ad.296e1",
+        "wires": [
+            [
+                "84c93cbb.6b991"
+            ]
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json
index 4c7c450c..6c592174 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-generate-name.json
@@ -1,2936 +1,263 @@
-[
-    {
-        "id": "9d01f665.242718",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 120,
-        "y": 60,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "8d2cd10d.7836b8"
-            ]
-        ]
-    },
-    {
-        "id": "8d2cd10d.7836b8",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 368.5713806152344,
-        "y": 62.428558349609375,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "3bb04424.165b2c"
-            ]
-        ]
-    },
-    {
-        "id": "3bb04424.165b2c",
-        "type": "method",
-        "name": "self-serve-generate-name",
-        "xml": "<method rpc='self-serve-generate-name' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 672.1428527832031,
-        "y": 60.99999237060547,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "f544f42f.79e4c8"
-            ]
-        ]
-    },
-    {
-        "id": "f544f42f.79e4c8",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 171.14285278320312,
-        "y": 146.99999237060547,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "af15506f.05852",
-                "d5abcd9b.9745b",
-                "9587cb6f.6286",
-                "c8c9dba8.4a219",
-                "c465ea91.13fb38"
-            ]
-        ]
-    },
-    {
-        "id": "8b3cd365.e1b4c",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1736.8572082519531,
-        "y": 873.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "af15506f.05852",
-        "type": "set",
-        "name": "set capability-name",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
-        "comments": "",
-        "x": 370.1428527832031,
-        "y": 147.99999237060547,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "d5abcd9b.9745b",
-        "type": "call",
-        "name": "call capability-param-resolution",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 399.1428527832031,
-        "y": 239,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "7aabee17.1c5ba8",
-                "8a0a976d.bb54a"
-            ]
-        ]
-    },
-    {
-        "id": "57f8f575.c14294",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1170.6430053710938,
-        "y": 504.4285125732422,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "45ec186d.6638d8"
-            ]
-        ]
-    },
-    {
-        "id": "45ec186d.6638d8",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1413.5000610351562,
-        "y": 504.4285125732422,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c34ee0d3.7925f8"
-            ]
-        ]
-    },
-    {
-        "id": "c34ee0d3.7925f8",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1594.2144165039062,
-        "y": 504.4284973144531,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "fbccf37.88f999"
-            ]
-        ]
-    },
-    {
-        "id": "d539f25c.c0e5b8",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1706.3572082519531,
-        "y": 674.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "59762169.0b874"
-            ]
-        ]
-    },
-    {
-        "id": "7aabee17.1c5ba8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 622.1428527832031,
-        "y": 207,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1370aa99.4464d5"
-            ]
-        ]
-    },
-    {
-        "id": "8a0a976d.bb54a",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 631.1428527832031,
-        "y": 273,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1370aa99.4464d5"
-            ]
-        ]
-    },
-    {
-        "id": "1370aa99.4464d5",
-        "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 capability-param-resolution\" />\n",
-        "comments": "",
-        "x": 824.1428527832031,
-        "y": 207,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "c41bbe96.bcfb",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
-        "comments": "",
-        "x": 2308.857208251953,
-        "y": 672.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "5ed4030d.2a373c",
-        "type": "set",
-        "name": "set set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
-        "comments": "",
-        "x": 1703.8573608398438,
-        "y": 599.9998626708984,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "5c5e5f8.5a649a",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
-        "comments": "",
-        "x": 1703.8572082519531,
-        "y": 736.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "30621c93.731054",
-        "type": "set",
-        "name": "set close payload list",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
-        "comments": "",
-        "x": 1709.8572082519531,
-        "y": 801.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "ea2a8ca.3b9d37",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1739.8572082519531,
-        "y": 927.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "97b12709.514e68",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2105.857177734375,
-        "y": 949.1427612304688,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "718393eb.a09b34"
-            ]
-        ]
-    },
-    {
-        "id": "f738cd51.cd41e",
-        "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 NameGenerationNode Unassign\" />\n",
-        "comments": "",
-        "x": 2470.857177734375,
-        "y": 1049.1427612304688,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "d0e601f9.671c6",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2110.857177734375,
-        "y": 1048.1427612304688,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "718393eb.a09b34"
-            ]
-        ]
-    },
-    {
-        "id": "718393eb.a09b34",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2268.857177734375,
-        "y": 993.1427612304688,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "bcc4f011.c46088",
-                "f738cd51.cd41e"
-            ]
-        ]
-    },
-    {
-        "id": "bcc4f011.c46088",
-        "type": "set",
-        "name": "set status as FAILED",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 2484.857177734375,
-        "y": 940.1427612304688,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "d674890d.0b54b8",
-        "type": "switchNode",
-        "name": "switch capability action assign",
-        "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 794.3809204101562,
-        "y": 1631.7618560791016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "20e0c70b.391c68"
-            ]
-        ]
-    },
-    {
-        "id": "20e0c70b.391c68",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1049.0951538085938,
-        "y": 1631.7618560791016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "e6d807c0.e53738"
-            ]
-        ]
-    },
-    {
-        "id": "c101db98.1e6f7",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1951.8572082519531,
-        "y": 1229.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c97cd966.464808"
-            ]
-        ]
-    },
-    {
-        "id": "16707bfd.c97154",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2154.857208251953,
-        "y": 1447.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "a824ee12.8cc8e8"
-            ]
-        ]
-    },
-    {
-        "id": "a824ee12.8cc8e8",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2364.857208251953,
-        "y": 1447.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c872b3d2.2f9e08"
-            ]
-        ]
-    },
-    {
-        "id": "8cb3cf6f.94a54",
-        "type": "set",
-        "name": "set set payload data",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
-        "comments": "",
-        "x": 2678.0235595703125,
-        "y": 1425.9205322265625,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "b9d7571b.298638",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1720.8572082519531,
-        "y": 1132.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f2cc0f54.bb60e8",
-        "type": "for",
-        "name": "for response elements",
-        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1713.8572082519531,
-        "y": 1228.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c101db98.1e6f7"
-            ]
-        ]
-    },
-    {
-        "id": "c97cd966.464808",
-        "type": "execute",
-        "name": "slistringUtils - check value for $",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2255.857208251953,
-        "y": 1229.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "bad123a5.0894c8"
-            ]
-        ]
-    },
-    {
-        "id": "bad123a5.0894c8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2495.857208251953,
-        "y": 1228.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "be18f58.a0ee008"
-            ]
-        ]
-    },
-    {
-        "id": "1bb7fc63.6e9f3c",
-        "type": "execute",
-        "name": "split resource-resolution-data",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2162.857208251953,
-        "y": 1299.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d888d83a.b7d8",
-        "type": "execute",
-        "name": "split resource-resolution-split-1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2177.857208251953,
-        "y": 1382.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fbccf37.88f999",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1496.8572082519531,
-        "y": 600.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "5ed4030d.2a373c",
-                "d539f25c.c0e5b8",
-                "5c5e5f8.5a649a",
-                "30621c93.731054",
-                "8b3cd365.e1b4c",
-                "b9d7571b.298638",
-                "f2cc0f54.bb60e8",
-                "ea2a8ca.3b9d37",
-                "4379c30d.8a80a4"
-            ]
-        ]
-    },
-    {
-        "id": "ef4a1fc.34c336",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1635.5236206054688,
-        "y": 2116.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "90f9be75.fa811",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1743.0236206054688,
-        "y": 1932.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "89254dc2.7f4cd8"
-            ]
-        ]
-    },
-    {
-        "id": "89254dc2.7f4cd8",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
-        "comments": "",
-        "x": 1995.5236206054688,
-        "y": 1932.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "3d749bd0.06285c",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n",
-        "comments": "",
-        "x": 1723.9520874023438,
-        "y": 1871.3808135986328,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "3a35a7fe.ef5ea8",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
-        "comments": "",
-        "x": 1725.5236206054688,
-        "y": 1988.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "85561c80.3ef308",
-        "type": "set",
-        "name": "set close payload list",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
-        "comments": "",
-        "x": 1610.5236206054688,
-        "y": 2073.6663360595703,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "4c175841.300a1",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1636.5236206054688,
-        "y": 2167.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "88d774fa.1d1a38",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1977.523681640625,
-        "y": 2201.66650390625,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c5c5c44f.80e79"
-            ]
-        ]
-    },
-    {
-        "id": "1dbcec72.a673cc",
-        "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 NameGenerationNode Assign\" />\n",
-        "comments": "",
-        "x": 2342.523681640625,
-        "y": 2301.66650390625,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "157b3125.a0ffff",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1982.523681640625,
-        "y": 2300.66650390625,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c5c5c44f.80e79"
-            ]
-        ]
-    },
-    {
-        "id": "c5c5c44f.80e79",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2140.523681640625,
-        "y": 2245.66650390625,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "24a305ec.7924e2",
-                "1dbcec72.a673cc"
-            ]
-        ]
-    },
-    {
-        "id": "24a305ec.7924e2",
-        "type": "set",
-        "name": "set status as FAILED",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 2356.523681640625,
-        "y": 2192.66650390625,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "76848f5c.5c31a",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1856.5236206054688,
-        "y": 2424.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "d362ce7b.44bc4"
-            ]
-        ]
-    },
-    {
-        "id": "6e2978a6.3a8118",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2059.5236206054688,
-        "y": 2642.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "6be9a784.88ae8"
-            ]
-        ]
-    },
-    {
-        "id": "6be9a784.88ae8",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2269.5236206054688,
-        "y": 2642.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "88e1aa71.08c4d"
-            ]
-        ]
-    },
-    {
-        "id": "d351c878.19363",
-        "type": "set",
-        "name": "set set payload data",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
-        "comments": "",
-        "x": 2622.6903076171875,
-        "y": 2611.4442138671875,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "333a840.1d25d7c",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1617.5236206054688,
-        "y": 2326.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f671137e.43c9",
-        "type": "for",
-        "name": "for response elements",
-        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1609.5236206054688,
-        "y": 2423.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "76848f5c.5c31a"
-            ]
-        ]
-    },
-    {
-        "id": "d362ce7b.44bc4",
-        "type": "execute",
-        "name": "slistringUtils - check value for $",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2160.5236206054688,
-        "y": 2424.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "9fd05568.528db8"
-            ]
-        ]
-    },
-    {
-        "id": "9fd05568.528db8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2400.5236206054688,
-        "y": 2423.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "70491a0a.6a6a24"
-            ]
-        ]
-    },
-    {
-        "id": "925d0988.c8bd58",
-        "type": "execute",
-        "name": "split resource-resolution-data",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2067.5236206054688,
-        "y": 2494.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3d173098.20141",
-        "type": "execute",
-        "name": "split resource-resolution-split-1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2082.5236206054688,
-        "y": 2577.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "70491a0a.6a6a24",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1851.5236206054688,
-        "y": 2494.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "925d0988.c8bd58",
-                "3d173098.20141",
-                "6e2978a6.3a8118"
-            ]
-        ]
-    },
-    {
-        "id": "94a9278.dd98e58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1520.6666870117188,
-        "y": 1850.9520416259766,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "3d749bd0.06285c",
-                "90f9be75.fa811",
-                "3a35a7fe.ef5ea8"
-            ]
-        ]
-    },
-    {
-        "id": "59762169.0b874",
-        "type": "switchNode",
-        "name": "switch external-key",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1944.8572082519531,
-        "y": 673.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "3be873de.5f56e4"
-            ]
-        ]
-    },
-    {
-        "id": "3be873de.5f56e4",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2128.857208251953,
-        "y": 673.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c41bbe96.bcfb"
-            ]
-        ]
-    },
-    {
-        "id": "a56c2f8a.64a94",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1856.4762573242188,
-        "y": 4087.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "75bd0dd1.6885f4",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='i' 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": 1144.9761352539062,
-        "y": 3699.3333892822266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1a936a5a.dcff5e"
-            ]
-        ]
-    },
-    {
-        "id": "1a936a5a.dcff5e",
-        "type": "switchNode",
-        "name": "switch capability-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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1424.9761352539062,
-        "y": 3699.3333892822266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "d02ebe6c.238e3"
-            ]
-        ]
-    },
-    {
-        "id": "d02ebe6c.238e3",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1633.9762573242188,
-        "y": 3699.3333892822266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "17f1cb31.5694ed"
-            ]
-        ]
-    },
-    {
-        "id": "a4f0128d.13f6b",
-        "type": "for",
-        "name": "for vf-module-parameters",
-        "xml": "<for index='j' 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[$i].resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1825.9762573242188,
-        "y": 3888.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "206ac6d4.7ae67a"
-            ]
-        ]
-    },
-    {
-        "id": "e421640.8a1ea2",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" 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[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" 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[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
-        "comments": "",
-        "x": 2428.4762573242188,
-        "y": 3886.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "2167bfb4.daf4d",
-        "type": "set",
-        "name": "set set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
-        "comments": "",
-        "x": 1823.4762573242188,
-        "y": 3811.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "b585badd.35b568",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
-        "comments": "",
-        "x": 1823.4762573242188,
-        "y": 3950.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "bb4dfba2.da8018",
-        "type": "set",
-        "name": "set close payload list",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
-        "comments": "",
-        "x": 1829.4762573242188,
-        "y": 4015.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "73f361ac.bbceb8",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1859.4762573242188,
-        "y": 4141.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cb05a44b.81acd",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2189.476318359375,
-        "y": 4163.3330078125,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "53f184d5.f04db4"
-            ]
-        ]
-    },
-    {
-        "id": "ac469966.f9f0b",
-        "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 NameGenerationNode Unassign\" />\n",
-        "comments": "",
-        "x": 2554.476318359375,
-        "y": 4263.3330078125,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "ba1d7d79.ebca9",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2194.476318359375,
-        "y": 4262.3330078125,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "53f184d5.f04db4"
-            ]
-        ]
-    },
-    {
-        "id": "53f184d5.f04db4",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2352.476318359375,
-        "y": 4207.3330078125,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "d5a758ad.0c7368",
-                "ac469966.f9f0b"
-            ]
-        ]
-    },
-    {
-        "id": "d5a758ad.0c7368",
-        "type": "set",
-        "name": "set status as FAILED",
-        "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[$i].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 2568.476318359375,
-        "y": 4154.3330078125,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "8566b45.4555748",
-        "type": "for",
-        "name": "for vf-module-parameters",
-        "xml": "<for index='l' 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": 2071.4762573242188,
-        "y": 4443.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "bcafdf43.c97df8"
-            ]
-        ]
-    },
-    {
-        "id": "bfa1ad98.e1291",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2274.4762573242188,
-        "y": 4661.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1695dfe6.8492a"
-            ]
-        ]
-    },
-    {
-        "id": "1695dfe6.8492a",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2484.4762573242188,
-        "y": 4661.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "29601f42.c65388"
-            ]
-        ]
-    },
-    {
-        "id": "29601f42.c65388",
-        "type": "set",
-        "name": "set set payload 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[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
-        "comments": "",
-        "x": 2680.9762573242188,
-        "y": 4662.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "e7b4e270.a2e688",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1840.4762573242188,
-        "y": 4346.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dc4b9b10.f541",
-        "type": "for",
-        "name": "for response elements",
-        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1833.4762573242188,
-        "y": 4442.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "8566b45.4555748"
-            ]
-        ]
-    },
-    {
-        "id": "bcafdf43.c97df8",
-        "type": "execute",
-        "name": "slistringUtils - check value for $",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2375.4762573242188,
-        "y": 4443.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "576f293f.cd5a6"
-            ]
-        ]
-    },
-    {
-        "id": "576f293f.cd5a6",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2615.4762573242188,
-        "y": 4442.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "7103d8d3.c872d8"
-            ]
-        ]
-    },
-    {
-        "id": "3a69492f.bb2bae",
-        "type": "execute",
-        "name": "split resource-resolution-data",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' 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[$l].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2282.4762573242188,
-        "y": 4513.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c5cb3ca9.bf8848",
-        "type": "execute",
-        "name": "split resource-resolution-split-1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2297.4762573242188,
-        "y": 4596.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7103d8d3.c872d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2066.4762573242188,
-        "y": 4513.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "3a69492f.bb2bae",
-                "c5cb3ca9.bf8848",
-                "bfa1ad98.e1291"
-            ]
-        ]
-    },
-    {
-        "id": "17f1cb31.5694ed",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1616.4762573242188,
-        "y": 3814.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "2167bfb4.daf4d",
-                "a4f0128d.13f6b",
-                "b585badd.35b568",
-                "bb4dfba2.da8018",
-                "a56c2f8a.64a94",
-                "e7b4e270.a2e688",
-                "50a18ce1.97fc1c",
-                "dc4b9b10.f541",
-                "73f361ac.bbceb8",
-                "40117641.f32018"
-            ]
-        ]
-    },
-    {
-        "id": "50a18ce1.97fc1c",
-        "type": "set",
-        "name": "set status as DELETED",
-        "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[$i].resource-resolution-data.status`' value='DELETED' />",
-        "comments": "",
-        "x": 1838.4762573242188,
-        "y": 4396.332901000977,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "206ac6d4.7ae67a",
-        "type": "switchNode",
-        "name": "switch external-key",
-        "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[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2064.4762573242188,
-        "y": 3887.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "5fae231d.5272ac"
-            ]
-        ]
-    },
-    {
-        "id": "5fae231d.5272ac",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2248.4762573242188,
-        "y": 3887.3329010009766,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "e421640.8a1ea2"
-            ]
-        ]
-    },
-    {
-        "id": "9587cb6f.6286",
-        "type": "switchNode",
-        "name": "switch capability-type. vnf",
-        "xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 380.1428527832031,
-        "y": 317.99999237060547,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "aad954ce.802738"
-            ]
-        ]
-    },
-    {
-        "id": "aad954ce.802738",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 583.5714111328125,
-        "y": 317.2857208251953,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "d4962dde.7144a8"
-            ]
-        ]
-    },
-    {
-        "id": "c8c9dba8.4a219",
-        "type": "switchNode",
-        "name": "switch capability-type vf-module",
-        "xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 509.4761962890625,
-        "y": 3481.3333282470703,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "8771ea99.a3f9d"
-            ]
-        ]
-    },
-    {
-        "id": "8771ea99.a3f9d",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 728.4761962890625,
-        "y": 3482.3333892822266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "52b0c642.e848e8"
-            ]
-        ]
-    },
-    {
-        "id": "99f26ef3.280eb",
-        "type": "for",
-        "name": "for vnf-parameters data",
-        "xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1621.5236206054688,
-        "y": 2603.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "442eaa12.f66c1c"
-            ]
-        ]
-    },
-    {
-        "id": "442eaa12.f66c1c",
-        "type": "execute",
-        "name": "slistringUtils - check value for $",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1747.1902465820312,
-        "y": 2734.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "b6eb4a26.4fec"
-            ]
-        ]
-    },
-    {
-        "id": "b6eb4a26.4fec",
-        "type": "failure",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2009.1902465820312,
-        "y": 2790.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "67977d8b.c5df04"
-            ]
-        ]
-    },
-    {
-        "id": "67977d8b.c5df04",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2225.1902465820312,
-        "y": 2790.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "829756fc.3cfc5",
-                "5eef2fa5.addbc8"
-            ]
-        ]
-    },
-    {
-        "id": "829756fc.3cfc5",
-        "type": "set",
-        "name": "set capability name",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.capability-name`' value='INPUT' />",
-        "comments": "",
-        "x": 2451.8568115234375,
-        "y": 2766.4444580078125,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "5eef2fa5.addbc8",
-        "type": "set",
-        "name": "set status SUCCESS",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />\n",
-        "comments": "",
-        "x": 2455.1902465820312,
-        "y": 2836.6663970947266,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "1fbc0bf7.d9d60c",
-        "type": "switchNode",
-        "name": "switch capability action unassign",
-        "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 837.7142333984375,
-        "y": 408.1428680419922,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "efd6575c.f07d5"
-            ]
-        ]
-    },
-    {
-        "id": "efd6575c.f07d5",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1123.4285278320312,
-        "y": 406.7142791748047,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "57f8f575.c14294"
-            ]
-        ]
-    },
-    {
-        "id": "d4962dde.7144a8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 587.7142944335938,
-        "y": 382.42860412597656,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1fbc0bf7.d9d60c",
-                "d674890d.0b54b8"
-            ]
-        ]
-    },
-    {
-        "id": "177385a3.c043a2",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1062.0715942382812,
-        "y": 1794.166763305664,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "30d24fbb.704358"
-            ]
-        ]
-    },
-    {
-        "id": "30d24fbb.704358",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1303.6786499023438,
-        "y": 1794.166763305664,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "a88e7b27.acd89"
-            ]
-        ]
-    },
-    {
-        "id": "a88e7b27.acd89",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1484.3930053710938,
-        "y": 1794.166763305664,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "94a9278.dd98e58"
-            ]
-        ]
-    },
-    {
-        "id": "1954307b.1b2ba8",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1216.8572387695312,
-        "y": 3610.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "75bd0dd1.6885f4"
-            ]
-        ]
-    },
-    {
-        "id": "dcef770e.c6ccf8",
-        "type": "switchNode",
-        "name": "switch capability action unassign",
-        "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 975.8569946289062,
-        "y": 3610.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1954307b.1b2ba8"
-            ]
-        ]
-    },
-    {
-        "id": "52b0c642.e848e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 732.8571166992188,
-        "y": 3547.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "dcef770e.c6ccf8",
-                "ef3aabef.23d1a8"
-            ]
-        ]
-    },
-    {
-        "id": "ef3aabef.23d1a8",
-        "type": "switchNode",
-        "name": "switch capability action assign",
-        "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 952.8096313476562,
-        "y": 5218.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "83323826.8871c8"
-            ]
-        ]
-    },
-    {
-        "id": "83323826.8871c8",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1181.8096313476562,
-        "y": 5218.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "b2d3cc7b.89669"
-            ]
-        ]
-    },
-    {
-        "id": "9f73d864.8536d8",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1730.3095092773438,
-        "y": 5688.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e105813.22ffe8",
-        "type": "for",
-        "name": "for vf-module-parameters",
-        "xml": "<for index='j' 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[$i].resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2048.5595092773438,
-        "y": 5496.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "9ebe174c.cca8f8"
-            ]
-        ]
-    },
-    {
-        "id": "9ebe174c.cca8f8",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" 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[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" 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[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
-        "comments": "",
-        "x": 2305.0595092773438,
-        "y": 5496.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "89efd59e.cf284",
-        "type": "set",
-        "name": "set set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
-        "comments": "",
-        "x": 2031.0595092773438,
-        "y": 5442.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "4f8d850b.bbbc44",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
-        "comments": "",
-        "x": 2037.0595092773438,
-        "y": 5558.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "98c04a64.a011c",
-        "type": "set",
-        "name": "set close payload list",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
-        "comments": "",
-        "x": 1700.3095092773438,
-        "y": 5637.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "d2f1471f.d735d",
-        "type": "execute",
-        "name": "execute replace extra comma",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
-        "comments": "",
-        "outputs": 1,
-        "x": 1733.3095092773438,
-        "y": 5742.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7e5bd1ab.209ca",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2036.3095703125,
-        "y": 5756.58447265625,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "42fc5b6c.345bdc"
-            ]
-        ]
-    },
-    {
-        "id": "1e009a1e.612266",
-        "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 NameGenerationNode Assign\" />\n",
-        "comments": "",
-        "x": 2401.3095703125,
-        "y": 5856.58447265625,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "90a92735.264c5",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2041.3095703125,
-        "y": 5855.58447265625,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "42fc5b6c.345bdc"
-            ]
-        ]
-    },
-    {
-        "id": "42fc5b6c.345bdc",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2199.3095703125,
-        "y": 5800.58447265625,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1e009a1e.612266",
-                "91ff7811.5db32"
-            ]
-        ]
-    },
-    {
-        "id": "91ff7811.5db32",
-        "type": "set",
-        "name": "set status as FAILED",
-        "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[$i].resource-resolution-data.status`' value='FAILED' />",
-        "comments": "",
-        "x": 2415.3095703125,
-        "y": 5747.58447265625,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "9626c789.309858",
-        "type": "for",
-        "name": "for vf-module-parameters",
-        "xml": "<for index='l' 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": 2011.3095092773438,
-        "y": 6332.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "df02f986.45d718"
-            ]
-        ]
-    },
-    {
-        "id": "1035d4b9.e79303",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2182.3095092773438,
-        "y": 6490.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "d32665c0.ffe428"
-            ]
-        ]
-    },
-    {
-        "id": "d32665c0.ffe428",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2386.3095092773438,
-        "y": 6488.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "24aa734a.87d674"
-            ]
-        ]
-    },
-    {
-        "id": "24aa734a.87d674",
-        "type": "set",
-        "name": "set set payload 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[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
-        "comments": "",
-        "x": 2580.8095092773438,
-        "y": 6421.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "b6489347.bb4308",
-        "type": "execute",
-        "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1714.3095092773438,
-        "y": 5855.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c7bfb325.ec2d98",
-        "type": "for",
-        "name": "for response elements",
-        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1743.3095092773438,
-        "y": 6333.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "9626c789.309858"
-            ]
-        ]
-    },
-    {
-        "id": "df02f986.45d718",
-        "type": "execute",
-        "name": "slistringUtils - check value for $",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2295.3095092773438,
-        "y": 6336.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c66b75af.b35668"
-            ]
-        ]
-    },
-    {
-        "id": "c66b75af.b35668",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2523.3095092773438,
-        "y": 6333.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "a8f90ed5.c9b5a8"
-            ]
-        ]
-    },
-    {
-        "id": "a4a7fab0.32e9b8",
-        "type": "execute",
-        "name": "split resource-resolution-data",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' 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[$l].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2190.3095092773438,
-        "y": 6386.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b57bbec9.12ea6",
-        "type": "execute",
-        "name": "split resource-resolution-split-1",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2203.3095092773438,
-        "y": 6445.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a8f90ed5.c9b5a8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1950.3095092773438,
-        "y": 6412.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1035d4b9.e79303",
-                "a4a7fab0.32e9b8",
-                "b57bbec9.12ea6"
-            ]
-        ]
-    },
-    {
-        "id": "9c309af6.f7e4a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1824.0595092773438,
-        "y": 5445.334121704102,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "e105813.22ffe8",
-                "89efd59e.cf284",
-                "4f8d850b.bbbc44"
-            ]
-        ]
-    },
-    {
-        "id": "3caf0f0c.12a5b8",
-        "type": "set",
-        "name": "set status as SUCCESS",
-        "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[$i].resource-resolution-data.status`' value='SUCCESS' />",
-        "comments": "",
-        "x": 1716.3095092773438,
-        "y": 5907.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "267d42ee.73dbde",
-        "type": "for",
-        "name": "for vnf parameters data",
-        "xml": "<for index='l' 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": 1738.3095092773438,
-        "y": 6555.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "8fcead9b.0e0b8"
-            ]
-        ]
-    },
-    {
-        "id": "8fcead9b.0e0b8",
-        "type": "execute",
-        "name": "slistringUtils - check value for $",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2044.3095092773438,
-        "y": 6553.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "f158d276.0d8658"
-            ]
-        ]
-    },
-    {
-        "id": "f158d276.0d8658",
-        "type": "failure",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2282.3095092773438,
-        "y": 6553.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "3621a169.1458b6"
-            ]
-        ]
-    },
-    {
-        "id": "3621a169.1458b6",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2444.3095092773438,
-        "y": 6547.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "fef37cdf.87178",
-                "157e032d.744875"
-            ]
-        ]
-    },
-    {
-        "id": "fef37cdf.87178",
-        "type": "set",
-        "name": "set capability 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[$l].resource-resolution-data.capability-name`' value='INPUT' />\n",
-        "comments": "",
-        "x": 2668.3095092773438,
-        "y": 6513.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "157e032d.744875",
-        "type": "set",
-        "name": "set status SUCCESS",
-        "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[$l].resource-resolution-data.status`' value='SUCCESS' />\n\t",
-        "comments": "",
-        "x": 2656.3095092773438,
-        "y": 6613.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "8a66938a.1460b",
-        "type": "for",
-        "name": "for vnf-parameters data",
-        "xml": "<for index='cn' 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": 1726.3095092773438,
-        "y": 6013.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "e7e744c9.85b75"
-            ]
-        ]
-    },
-    {
-        "id": "e7e744c9.85b75",
-        "type": "switchNode",
-        "name": "switch param[] 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[$cn].name == 'vnfc-name'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1979.8095092773438,
-        "y": 6014.584854125977,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "2a4c76d1.47e9a2"
-            ]
-        ]
-    },
-    {
-        "id": "2a4c76d1.47e9a2",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2172.8095092773438,
-        "y": 6015.084732055664,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "2c6b125a.5ec166"
-            ]
-        ]
-    },
-    {
-        "id": "2c6b125a.5ec166",
-        "type": "for",
-        "name": "for j in resource key",
-        "xml": "<for silentFailure='true' index='j' 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[$cn].resource-resolution-data.resource-key_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1820.0238647460938,
-        "y": 6123.870666503906,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "eb80eaa0.5a981"
-            ]
-        ]
-    },
-    {
-        "id": "eb80eaa0.5a981",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2090.5953369140625,
-        "y": 6125.584655761719,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "e4d68431.8d96a8",
-                "ecab974a.9bbd78",
-                "314dd1f2.f106d6",
-                "435ecba0.88a2c4",
-                "18703684.a36359",
-                "5a418843.fb8ce",
-                "658b4432.deae1c"
-            ]
-        ]
-    },
-    {
-        "id": "ecab974a.9bbd78",
-        "type": "switchNode",
-        "name": "switch model-invariant-uuid",
-        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-invariant-uuid'`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2524.3095092773438,
-        "y": 6001.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "cf5cb0c4.d1ede8"
-            ]
-        ]
-    },
-    {
-        "id": "314dd1f2.f106d6",
-        "type": "switchNode",
-        "name": "switch model-customization-uuid",
-        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-customization-uuid'`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2492.3095092773438,
-        "y": 6059.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "70feaf3a.73ab2"
-            ]
-        ]
-    },
-    {
-        "id": "435ecba0.88a2c4",
-        "type": "switchNode",
-        "name": "switch model-uuid",
-        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-uuid'`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2490.3095092773438,
-        "y": 6121.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "40b980ec.ac6338"
-            ]
-        ]
-    },
-    {
-        "id": "18703684.a36359",
-        "type": "switchNode",
-        "name": "switch model-version",
-        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-version'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2498.3095092773438,
-        "y": 6183.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "3405bb1d.191ce4"
-            ]
-        ]
-    },
-    {
-        "id": "e4d68431.8d96a8",
-        "type": "switchNode",
-        "name": "switch vm-type",
-        "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[$cn].resource-resolution-data.resource-key[$j].name == 'vm-type'`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2514.3095092773438,
-        "y": 5929.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "8cbeeb62.d5961"
-            ]
-        ]
-    },
-    {
-        "id": "8cbeeb62.d5961",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718.3095092773438,
-        "y": 5925.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "57750a1a.165544"
-            ]
-        ]
-    },
-    {
-        "id": "cf5cb0c4.d1ede8",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718.3095092773438,
-        "y": 5999.834487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "57206663.d5c56"
-            ]
-        ]
-    },
-    {
-        "id": "70feaf3a.73ab2",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2724.3095092773438,
-        "y": 6055.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "b4b44bc3.5bb8a8"
-            ]
-        ]
-    },
-    {
-        "id": "40b980ec.ac6338",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2728.3095092773438,
-        "y": 6113.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "8cc0d8fe.d3593"
-            ]
-        ]
-    },
-    {
-        "id": "3405bb1d.191ce4",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2734.3095092773438,
-        "y": 6179.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "f57a9876.705b68"
-            ]
-        ]
-    },
-    {
-        "id": "57750a1a.165544",
-        "type": "set",
-        "name": "set vm-type",
-        "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-assignments.vms.vm[0].vm-type`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
-        "comments": "",
-        "x": 2882.3095092773438,
-        "y": 5927.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "57206663.d5c56",
-        "type": "set",
-        "name": "set model-invariant-uuid",
-        "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-assignments.vms.vm[0].onap-model-information.model-invariant-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
-        "comments": "",
-        "x": 2928.3095092773438,
-        "y": 5993.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "b4b44bc3.5bb8a8",
-        "type": "set",
-        "name": "set model-customization-uuid",
-        "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-assignments.vms.vm[0].onap-model-information.model-customization-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
-        "comments": "",
-        "x": 2972.3095092773438,
-        "y": 6057.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "8cc0d8fe.d3593",
-        "type": "set",
-        "name": "set model-uuid",
-        "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-assignments.vms.vm[0].onap-model-information.model-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
-        "comments": "",
-        "x": 2948.3095092773438,
-        "y": 6111.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "f57a9876.705b68",
-        "type": "set",
-        "name": "set model-version",
-        "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-assignments.vms.vm[0].onap-model-information.model-version`' 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[$cn].resource-resolution-data.resource-key[j].value`' />\n",
-        "comments": "",
-        "x": 2894.3095092773438,
-        "y": 6177.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "ec4b72ee.0d91e8",
-        "type": "set",
-        "name": "set model-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-assignments.vms.vm[0].onap-model-information.model-name`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
-        "comments": "",
-        "x": 2900.3095092773438,
-        "y": 6233.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "c2128119.3c59c8",
-        "type": "set",
-        "name": "set  vnfc-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-assignments.vms.vm[0].vm-names.vnfc-names[0].vnfc-name`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
-        "comments": "",
-        "x": 2918.3095092773438,
-        "y": 6289.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "5a418843.fb8ce",
-        "type": "switchNode",
-        "name": "switch model-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[$cn].resource-resolution-data.resource-key[$j].name == 'model-name'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2498.3095092773438,
-        "y": 6235.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "2b96a377.785aec"
-            ]
-        ]
-    },
-    {
-        "id": "658b4432.deae1c",
-        "type": "switchNode",
-        "name": "switch vnfc-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[$cn].resource-resolution-data.resource-key[$j].name == 'vnfc-name'`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2496.3095092773438,
-        "y": 6289.584487915039,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "2a2a4a91.63c3f6"
-            ]
-        ]
-    },
-    {
-        "id": "2b96a377.785aec",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2732.3095092773438,
-        "y": 6233.584487915038,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "ec4b72ee.0d91e8"
-            ]
-        ]
-    },
-    {
-        "id": "2a2a4a91.63c3f6",
-        "type": "success",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2726.3095092773438,
-        "y": 6287.584487915038,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "c2128119.3c59c8"
-            ]
-        ]
-    },
-    {
-        "id": "b9630ea3.d96b18",
-        "type": "for",
-        "name": "for vnf-parameters-data",
-        "xml": "<for index='i' 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": 1266.8571166992188,
-        "y": 5391.571670532227,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "bd4ce803.509a98"
-            ]
-        ]
-    },
-    {
-        "id": "bd4ce803.509a98",
-        "type": "switchNode",
-        "name": "switch capability-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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1546.8571166992188,
-        "y": 5391.571670532227,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "a5d1018e.3683e"
-            ]
-        ]
-    },
-    {
-        "id": "a5d1018e.3683e",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1755.8572387695312,
-        "y": 5391.571670532227,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "9c309af6.f7e4a"
-            ]
-        ]
-    },
-    {
-        "id": "e6d807c0.e53738",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 841.1071166992188,
-        "y": 1734.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "177385a3.c043a2",
-                "ff615e80.275a08",
-                "39178dc5.011a9a"
-            ]
-        ]
-    },
-    {
-        "id": "ff615e80.275a08",
-        "type": "set",
-        "name": "set payload data",
-        "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
-        "comments": "",
-        "x": 1048.8571166992188,
-        "y": 1735.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "39178dc5.011a9a",
-        "type": "switchNode",
-        "name": "switch tmp.naming-data-payload is null",
-        "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1096.8571166992188,
-        "y": 2014.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "781da2e9.01d83c"
-            ]
-        ]
-    },
-    {
-        "id": "781da2e9.01d83c",
-        "type": "not-found",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1333.8571166992188,
-        "y": 2015.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "600486cd.2b6308"
-            ]
-        ]
-    },
-    {
-        "id": "600486cd.2b6308",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1371.8571166992188,
-        "y": 2073.5714263916016,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "85561c80.3ef308",
-                "ef4a1fc.34c336",
-                "4c175841.300a1",
-                "333a840.1d25d7c",
-                "f671137e.43c9",
-                "99f26ef3.280eb",
-                "80fef6f4.c675b"
-            ]
-        ]
-    },
-    {
-        "id": "b2d3cc7b.89669",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1017.8571166992188,
-        "y": 5324.571426391602,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "6a40e563.5a14a4",
-                "b9630ea3.d96b18",
-                "7640b347.b23714"
-            ]
-        ]
-    },
-    {
-        "id": "6a40e563.5a14a4",
-        "type": "set",
-        "name": "set set payload data",
-        "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
-        "comments": "",
-        "x": 1254.8571166992188,
-        "y": 5323.571426391602,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "7640b347.b23714",
-        "type": "switchNode",
-        "name": "switch tmp.naming-data-payload is null",
-        "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1297.1071472167969,
-        "y": 5514.071548461914,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "48235ce0.3408cc"
-            ]
-        ]
-    },
-    {
-        "id": "48235ce0.3408cc",
-        "type": "not-found",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1530.857177734375,
-        "y": 5513.821304321289,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "7c76786f.4904"
-            ]
-        ]
-    },
-    {
-        "id": "7c76786f.4904",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1518.607177734375,
-        "y": 5591.071670532227,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "98c04a64.a011c",
-                "9f73d864.8536d8",
-                "d2f1471f.d735d",
-                "b6489347.bb4308",
-                "3caf0f0c.12a5b8",
-                "8a66938a.1460b",
-                "c7bfb325.ec2d98",
-                "267d42ee.73dbde",
-                "90b8bf99.7de998"
-            ]
-        ]
-    },
-    {
-        "id": "c465ea91.13fb38",
-        "type": "execute",
-        "name": "execute readProperties",
-        "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": 383,
-        "y": 193,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "90b8bf99.7de998",
-        "type": "execute",
-        "name": "execute RestApiCallNode - POST gen-name",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1779,
-        "y": 5804,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "7e5bd1ab.209ca",
-                "90a92735.264c5"
-            ]
-        ]
-    },
-    {
-        "id": "80fef6f4.c675b",
-        "type": "execute",
-        "name": "execute RestApiCallNode - POST gen-name",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1682,
-        "y": 2246,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "88d774fa.1d1a38",
-                "157b3125.a0ffff"
-            ]
-        ]
-    },
-    {
-        "id": "40117641.f32018",
-        "type": "execute",
-        "name": "execute RestApiCallNode - DELETE gen-name",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1899,
-        "y": 4211,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "cb05a44b.81acd",
-                "ba1d7d79.ebca9"
-            ]
-        ]
-    },
-    {
-        "id": "4379c30d.8a80a4",
-        "type": "execute",
-        "name": "execute RestApiCallNode - DELETE gen-name",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1792,
-        "y": 996,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "97b12709.514e68",
-                "d0e601f9.671c6"
-            ]
-        ]
-    },
-    {
-        "id": "de7f57d6.741e4",
-        "type": "comment",
-        "name": "For Generate Name DG Capability ",
-        "info": "Support Bulk assign and single delete\nAlso calls Naming gen mS for assign/un-assign\n\nAdded by Ajay Singh(as396y)",
-        "comments": "",
-        "x": 846,
-        "y": 123,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "169273ad.322bdc",
-        "type": "set",
-        "name": "set status as DELETED",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='DELETED' />",
-        "comments": "",
-        "x": 2691.1112060546875,
-        "y": 1477.7779541015625,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "24da0c57.b0398c",
-        "type": "set",
-        "name": "set status SUCCESS",
-        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />\n",
-        "comments": "",
-        "x": 2624.44482421875,
-        "y": 2671.1112670898438,
-        "z": "8ffa18ff.21a748",
-        "wires": []
-    },
-    {
-        "id": "be18f58.a0ee008",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1946.8572082519531,
-        "y": 1299.1427688598633,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "1bb7fc63.6e9f3c",
-                "d888d83a.b7d8",
-                "16707bfd.c97154"
-            ]
-        ]
-    },
-    {
-        "id": "c872b3d2.2f9e08",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2498.888916015625,
-        "y": 1444.4444580078125,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "169273ad.322bdc",
-                "8cb3cf6f.94a54"
-            ]
-        ]
-    },
-    {
-        "id": "88e1aa71.08c4d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2417.77783203125,
-        "y": 2640.0000610351562,
-        "z": "8ffa18ff.21a748",
-        "wires": [
-            [
-                "d351c878.19363",
-                "24da0c57.b0398c"
-            ]
-        ]
-    }
+[
+    {
+        "id": "e733d3b3.88487",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 156.42857360839844,
+        "y": 56.28571701049805,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "5099214f.ff319"
+            ]
+        ]
+    },
+    {
+        "id": "5099214f.ff319",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 293.74993896484375,
+        "y": 101.71427631378174,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "9032d171.479ce"
+            ]
+        ]
+    },
+    {
+        "id": "9032d171.479ce",
+        "type": "method",
+        "name": "self-serve-generate-name",
+        "xml": "<method rpc='self-serve-generate-name' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 284.2856903076172,
+        "y": 148.50000190734863,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "f89a758d.f2d688"
+            ]
+        ]
+    },
+    {
+        "id": "f89a758d.f2d688",
+        "type": "block",
+        "name": "block atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 324.71427154541016,
+        "y": 204.3214168548584,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "7a192e4.9f28dd",
+                "62de1a2e.d966a4",
+                "ac6c94b3.d6b0d8",
+                "c8dd1dbe.9238c"
+            ]
+        ]
+    },
+    {
+        "id": "7a192e4.9f28dd",
+        "type": "call",
+        "name": "call capability-param-resolution",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 612.1785354614258,
+        "y": 328.28571128845215,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "62de1a2e.d966a4",
+        "type": "switchNode",
+        "name": "switch capability-type",
+        "xml": "<switch test=\"`$ss.capability-type`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 576.571418762207,
+        "y": 456.21424102783203,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "77ff4341.7d270c",
+                "efdb53b3.8a016",
+                "c9749fd.9fd3e6"
+            ]
+        ]
+    },
+    {
+        "id": "77ff4341.7d270c",
+        "type": "not-found",
+        "name": "vnf",
+        "xml": "<outcome value='vnf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 792.8570251464844,
+        "y": 386.9285945892334,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "929d479d.ee2d38"
+            ]
+        ]
+    },
+    {
+        "id": "52d699f7.aeb4b8",
+        "type": "comment",
+        "name": "For Generate Name DG Capability ",
+        "info": "Support Bulk assign and single delete\nAlso calls Naming gen mS for assign/un-assign\n\nAdded by Ajay Singh(as396y)",
+        "comments": "",
+        "x": 842.2500152587891,
+        "y": 47.82143592834473,
+        "z": "3fe07db1.f5a992",
+        "wires": []
+    },
+    {
+        "id": "cb16a161.c8808",
+        "type": "execute",
+        "name": "execute PropertiesNode",
+        "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": 1002.8571145193919,
+        "y": 258.5714135851181,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ac6c94b3.d6b0d8",
+        "type": "switchNode",
+        "name": "switch prop.controller.user",
+        "xml": "<switch test='`$prop.controller.user`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 591.5713500976562,
+        "y": 259.0000343322754,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "6148eeff.8135c"
+            ]
+        ]
+    },
+    {
+        "id": "6148eeff.8135c",
+        "type": "failure",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 791.4284455435618,
+        "y": 258.5714488710678,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "cb16a161.c8808"
+            ]
+        ]
+    },
+    {
+        "id": "929d479d.ee2d38",
+        "type": "call",
+        "name": "call self-serve-vnf-generate-name",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1026.4285125732422,
+        "y": 388.214319229126,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "efdb53b3.8a016",
+        "type": "not-found",
+        "name": "vf-module",
+        "xml": "<outcome value='vf-module'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 805.0000076293945,
+        "y": 456.7857322692871,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "fa5e8ac7.51e088"
+            ]
+        ]
+    },
+    {
+        "id": "fa5e8ac7.51e088",
+        "type": "call",
+        "name": "call self-serve-vf-module-generate-name",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1069.8215026855469,
+        "y": 455.5714797973633,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c9749fd.9fd3e6",
+        "type": "not-found",
+        "name": "pnf",
+        "xml": "<outcome value='pnf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 792.1428756713867,
+        "y": 524.5000152587891,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            [
+                "4a09f790.f1dc68"
+            ]
+        ]
+    },
+    {
+        "id": "4a09f790.f1dc68",
+        "type": "call",
+        "name": "call self-serve-pnf-generate-name",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-generate-name' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1025.7143630981445,
+        "y": 523.7857398986816,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c8dd1dbe.9238c",
+        "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": 537.5000152587891,
+        "y": 694.6428542137146,
+        "z": "3fe07db1.f5a992",
+        "wires": [
+            []
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.json
new file mode 100644
index 00000000..8edc592d
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.json
@@ -0,0 +1,1012 @@
+[
+    {
+        "id": "b88c5216.b5736",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 95,
+        "y": 40,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "7457afc.e7b5c5"
+            ]
+        ]
+    },
+    {
+        "id": "7457afc.e7b5c5",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 347.5713806152344,
+        "y": 39.428558349609375,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "b2acf94b.e7a798"
+            ]
+        ]
+    },
+    {
+        "id": "b2acf94b.e7a798",
+        "type": "method",
+        "name": "self-serve-pnf-generate-name",
+        "xml": "<method rpc='self-serve-pnf-generate-name' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 217.80955505371094,
+        "y": 101.333327293396,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "507f9399.9a0afc"
+            ]
+        ]
+    },
+    {
+        "id": "50605a38.ff24c4",
+        "type": "comment",
+        "name": "For Generate Name PNF DG Capability ",
+        "info": "Support Bulk assign and single delete\nAlso calls Naming gen mS for assign/un-assign\n\nAdded by Ajay Singh(as396y)",
+        "comments": "",
+        "x": 1049.1269989013672,
+        "y": 49.84126853942871,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "a6a6a55.0a5fa58",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1210.412742614746,
+        "y": 729.587236404419,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ff8aed88.224a1",
+        "type": "for",
+        "name": "for pnf-parameters-data",
+        "xml": "<for index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 910.6152496337891,
+        "y": 316.2301368713379,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "ae413e8b.ac2d2"
+            ]
+        ]
+    },
+    {
+        "id": "ae413e8b.ac2d2",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1153.4723052978516,
+        "y": 316.2301368713379,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "6fb54d77.d6b6b4"
+            ]
+        ]
+    },
+    {
+        "id": "6fb54d77.d6b6b4",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1334.1866607666016,
+        "y": 316.2301216125488,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "ced67690.032b88"
+            ]
+        ]
+    },
+    {
+        "id": "e2604fbb.8e465",
+        "type": "for",
+        "name": "for pnf-parameters-data",
+        "xml": "<for index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1179.912742614746,
+        "y": 530.587236404419,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "cd134dba.3cd6c"
+            ]
+        ]
+    },
+    {
+        "id": "9b5b4bb4.5f0f08",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
+        "comments": "",
+        "x": 1782.412742614746,
+        "y": 528.587236404419,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "9f5057ce.521a68",
+        "type": "set",
+        "name": "set set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
+        "comments": "",
+        "x": 1177.4128952026367,
+        "y": 456.4443302154541,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "58b5a659.b08f18",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+        "comments": "",
+        "x": 1177.412742614746,
+        "y": 592.587236404419,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "d74076ad.786678",
+        "type": "set",
+        "name": "set close payload list",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
+        "comments": "",
+        "x": 1183.412742614746,
+        "y": 657.587236404419,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "9fd916b4.e81f98",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1213.412742614746,
+        "y": 783.587236404419,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "98250f74.201ec",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1559.4127349853516,
+        "y": 884.3372316360474,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "d417379f.ef0008"
+            ]
+        ]
+    },
+    {
+        "id": "69da5ad9.488e64",
+        "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 NameGenerationNode Unassign\" />\n",
+        "comments": "",
+        "x": 1939.4127349853516,
+        "y": 984.3372316360474,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "a0a83a6.20135c8",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1564.4127349853516,
+        "y": 983.3372316360474,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "d417379f.ef0008"
+            ]
+        ]
+    },
+    {
+        "id": "d417379f.ef0008",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1737.4127349853516,
+        "y": 928.3372316360474,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "69da5ad9.488e64",
+                "c07c288.2dea2d8"
+            ]
+        ]
+    },
+    {
+        "id": "c07c288.2dea2d8",
+        "type": "set",
+        "name": "set status as FAILED",
+        "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1953.4127349853516,
+        "y": 875.3372316360474,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "c5ce270d.60a958",
+        "type": "not-found",
+        "name": "assign",
+        "xml": "<outcome value='assign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 495.85315704345703,
+        "y": 1509.535545349121,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "641435f5.d1d47c"
+            ]
+        ]
+    },
+    {
+        "id": "23a07f7c.2da06",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186.912857055664,
+        "y": 1178.5872964859009,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ced67690.032b88",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 927.6627349853516,
+        "y": 456.5872564315796,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "a6a6a55.0a5fa58",
+                "e2604fbb.8e465",
+                "9f5057ce.521a68",
+                "58b5a659.b08f18",
+                "d74076ad.786678",
+                "9fd916b4.e81f98",
+                "23a07f7c.2da06",
+                "5154be9.24fa74",
+                "6f100298.62962c",
+                "6f4f57aa.3a7948",
+                "da93067c.a8af58",
+                "aea4c7b4.f8ea78"
+            ]
+        ]
+    },
+    {
+        "id": "2c460df5.c700d2",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1269.7815170288086,
+        "y": 1969.7180500030518,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "76d73cab.455524",
+        "type": "for",
+        "name": "for pnf-parameters-data",
+        "xml": "<for index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1742.2815570831299,
+        "y": 1591.9681177139282,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "af974742.1d3188"
+            ]
+        ]
+    },
+    {
+        "id": "af974742.1d3188",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
+        "comments": "",
+        "x": 1994.7815570831299,
+        "y": 1591.9681177139282,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "4a7d165d.01a3c8",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n",
+        "comments": "",
+        "x": 1723.2100238800049,
+        "y": 1530.6825342178345,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "e5d92c85.9a213",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
+        "comments": "",
+        "x": 1724.7815570831299,
+        "y": 1647.9681177139282,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "dcae6674.38adc8",
+        "type": "set",
+        "name": "set close payload list",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
+        "comments": "",
+        "x": 1244.7815170288086,
+        "y": 1926.7179889678955,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "608efea4.198bb",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1270.7815170288086,
+        "y": 2020.7180500030518,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4665057f.84ae0c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1616.7816314697266,
+        "y": 2108.468292236328,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "4e7bf830.d0c718"
+            ]
+        ]
+    },
+    {
+        "id": "96fca7a2.79f9b8",
+        "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 NameGenerationNode Assign\" />\n",
+        "comments": "",
+        "x": 1981.7816314697266,
+        "y": 2208.468292236328,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "9dc3547.3d8b5a8",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1621.7816314697266,
+        "y": 2207.468292236328,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "4e7bf830.d0c718"
+            ]
+        ]
+    },
+    {
+        "id": "4e7bf830.d0c718",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1779.7816314697266,
+        "y": 2152.468292236328,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "96fca7a2.79f9b8",
+                "ff3d6552.aec5c8"
+            ]
+        ]
+    },
+    {
+        "id": "ff3d6552.aec5c8",
+        "type": "set",
+        "name": "set status as FAILED",
+        "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1995.7816314697266,
+        "y": 2099.468292236328,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "75547aec.d75bf4",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1253.031509399414,
+        "y": 2333.4680500030518,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a5c01350.45acf",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1497.4246158599854,
+        "y": 1592.753761291504,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "76d73cab.455524",
+                "4a7d165d.01a3c8",
+                "e5d92c85.9a213"
+            ]
+        ]
+    },
+    {
+        "id": "cd134dba.3cd6c",
+        "type": "switchNode",
+        "name": "switch external-key",
+        "xml": "<switch test=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1418.412742614746,
+        "y": 529.587236404419,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "2f01bbf8.70ce94"
+            ]
+        ]
+    },
+    {
+        "id": "2f01bbf8.70ce94",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1602.412742614746,
+        "y": 529.587236404419,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "9b5b4bb4.5f0f08"
+            ]
+        ]
+    },
+    {
+        "id": "96c91f0b.6c04b",
+        "type": "switchNode",
+        "name": "switch capability action",
+        "xml": "<switch test=\"`$ss.capability-action`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 289.2142028808594,
+        "y": 897.2262077331543,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "1777cc80.a758a4",
+                "c5ce270d.60a958"
+            ]
+        ]
+    },
+    {
+        "id": "1777cc80.a758a4",
+        "type": "not-found",
+        "name": "unassign",
+        "xml": "<outcome value='unassign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 510.7619094848633,
+        "y": 255.73809051513672,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "1e39e688.436eb9"
+            ]
+        ]
+    },
+    {
+        "id": "507f9399.9a0afc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 198.93649291992188,
+        "y": 167.206392288208,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "96c91f0b.6c04b",
+                "72e5d646.4b96d8"
+            ]
+        ]
+    },
+    {
+        "id": "632468e.d02eb98",
+        "type": "for",
+        "name": "for pnf-parameters-data",
+        "xml": "<for index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 913.8295440673828,
+        "y": 1590.968406677246,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "d8ff59ce.2da9b8"
+            ]
+        ]
+    },
+    {
+        "id": "d8ff59ce.2da9b8",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1155.4365997314453,
+        "y": 1590.968406677246,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "326c3f39.df9cc"
+            ]
+        ]
+    },
+    {
+        "id": "326c3f39.df9cc",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1336.1509552001953,
+        "y": 1590.968406677246,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "a5c01350.45acf"
+            ]
+        ]
+    },
+    {
+        "id": "641435f5.d1d47c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 662.8650588989258,
+        "y": 1510.1230688095093,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "632468e.d02eb98",
+                "2ad6999a.91aec6",
+                "cc8c7404.a672b8"
+            ]
+        ]
+    },
+    {
+        "id": "2ad6999a.91aec6",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
+        "comments": "",
+        "x": 933.1150646209717,
+        "y": 1509.8730697631836,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "cc8c7404.a672b8",
+        "type": "switchNode",
+        "name": "switch tmp.naming-data-payload is null",
+        "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 969.8650665283203,
+        "y": 1788.8730735778809,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "579267aa.8a65f8"
+            ]
+        ]
+    },
+    {
+        "id": "579267aa.8a65f8",
+        "type": "not-found",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1233.1150093078613,
+        "y": 1789.8730735778809,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "95c16a04.014c18"
+            ]
+        ]
+    },
+    {
+        "id": "95c16a04.014c18",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1006.1150131225586,
+        "y": 1926.6230792999268,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "2c460df5.c700d2",
+                "dcae6674.38adc8",
+                "608efea4.198bb",
+                "75547aec.d75bf4",
+                "8bc3b38c.d0c4",
+                "4973abae.6e2f54",
+                "5be1d14c.05009",
+                "cc104486.f0b7b8"
+            ]
+        ]
+    },
+    {
+        "id": "8bc3b38c.d0c4",
+        "type": "execute",
+        "name": "execute RestApiCallNode - POST gen-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1321.2579498291016,
+        "y": 2152.801788330078,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "4665057f.84ae0c",
+                "9dc3547.3d8b5a8"
+            ]
+        ]
+    },
+    {
+        "id": "5154be9.24fa74",
+        "type": "execute",
+        "name": "execute RestApiCallNode - DELETE gen-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1260.5555572509766,
+        "y": 931.1944704055786,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "98250f74.201ec",
+                "a0a83a6.20135c8"
+            ]
+        ]
+    },
+    {
+        "id": "afb35f21.b905a",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
+        "comments": "",
+        "x": 932.5000076293945,
+        "y": 257.50000063702464,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "1e39e688.436eb9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 681.2500076293945,
+        "y": 256.25000190734863,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "afb35f21.b905a",
+                "ff8aed88.224a1"
+            ]
+        ]
+    },
+    {
+        "id": "6f100298.62962c",
+        "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 namegeneration.node.UnAssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1128.7500381469727,
+        "y": 857.5000114440918,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6f4f57aa.3a7948",
+        "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 namegeneration.node.UnAssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127.9167861938477,
+        "y": 1018.7500133514404,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "43f8c16b.8381",
+        "type": "switchNode",
+        "name": "switch resource-name",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1430.000015258789,
+        "y": 1310.0000267028809,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "743bf2b5.4af42c"
+            ]
+        ]
+    },
+    {
+        "id": "743bf2b5.4af42c",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1622.000015258789,
+        "y": 1309.0000267028809,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "a9563ae6.976b98"
+            ]
+        ]
+    },
+    {
+        "id": "a9563ae6.976b98",
+        "type": "set",
+        "name": "set set payload data",
+        "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
+        "comments": "",
+        "x": 1808.500015258789,
+        "y": 1309.0000267028809,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "aea4c7b4.f8ea78",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1182.0000076293945,
+        "y": 1309.0000190734863,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "43f8c16b.8381"
+            ]
+        ]
+    },
+    {
+        "id": "da93067c.a8af58",
+        "type": "set",
+        "name": "set status as DELETED",
+        "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />",
+        "comments": "",
+        "x": 1183.250015258789,
+        "y": 1250.5000171661377,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "4973abae.6e2f54",
+        "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 namegeneration.node.AssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1191.2500267028809,
+        "y": 2081.2500343322754,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5be1d14c.05009",
+        "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 namegeneration.node.AssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1187.9166946411133,
+        "y": 2236.25004196167,
+        "z": "47663f64.733c6",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e5fa05b3.04f778",
+        "type": "for",
+        "name": "for pnf-parameters-data",
+        "xml": "<for index='l' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1494.4403839111328,
+        "y": 2438.83305311203,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "cbff9132.cfa58"
+            ]
+        ]
+    },
+    {
+        "id": "cc104486.f0b7b8",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1247.4403839111328,
+        "y": 2437.83305311203,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "e5fa05b3.04f778"
+            ]
+        ]
+    },
+    {
+        "id": "cbff9132.cfa58",
+        "type": "switchNode",
+        "name": "switch resource-name",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1741.5356369018555,
+        "y": 2438.595028221607,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "ba666656.113a78"
+            ]
+        ]
+    },
+    {
+        "id": "6b42ec5e.e82174",
+        "type": "set",
+        "name": "set param value and status",
+        "xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />",
+        "comments": "",
+        "x": 2129.059555053711,
+        "y": 2437.3223574757576,
+        "z": "47663f64.733c6",
+        "wires": []
+    },
+    {
+        "id": "ba666656.113a78",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1925.8212394714355,
+        "y": 2438.166490852833,
+        "z": "47663f64.733c6",
+        "wires": [
+            [
+                "6b42ec5e.e82174"
+            ]
+        ]
+    },
+    {
+        "id": "72e5d646.4b96d8",
+        "type": "set",
+        "name": "set pathname for context logging",
+        "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-gen-name-' + \n\t$ss.capability-type + '-' + $ss.capability-action + '-' + \n\t$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.pnf-id + '.log'`\" />\n",
+        "comments": "",
+        "x": 497.50003814697266,
+        "y": 167.500018119812,
+        "z": "47663f64.733c6",
+        "wires": []
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-unassign.json
new file mode 100644
index 00000000..5ff86f47
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-unassign.json
@@ -0,0 +1,570 @@
+[
+    {
+        "id": "e84a6e75.7c345",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 132.85714721679688,
+        "y": 68.57142639160156,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "4527f9c9.e3cd68"
+            ]
+        ]
+    },
+    {
+        "id": "6453a3c7.280b9c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 176.5833511352539,
+        "y": 187.34921646118164,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "fc2411fd.005e",
+                "872fa153.cd35d",
+                "f5aecca9.cfab2",
+                "4c8375f7.09675c",
+                "22afbf75.056c9"
+            ]
+        ]
+    },
+    {
+        "id": "b25c9a05.1ca608",
+        "type": "method",
+        "name": "method self-serve-pnf-unassign",
+        "xml": "<method rpc='self-serve-pnf-unassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 249.61905670166016,
+        "y": 123.27778148651123,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "6453a3c7.280b9c"
+            ]
+        ]
+    },
+    {
+        "id": "4527f9c9.e3cd68",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 408.09534454345703,
+        "y": 68.76191902160645,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "b25c9a05.1ca608"
+            ]
+        ]
+    },
+    {
+        "id": "faba8e11.68d2e",
+        "type": "for",
+        "name": "foreach pnf-parameters-data.param[]",
+        "xml": "<for index='pidx' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 759.6074600219727,
+        "y": 466.13098526000977,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "68408564.24a50c",
+                "cd2b5b6f.2c7078"
+            ]
+        ]
+    },
+    {
+        "id": "e627cf9e.6ca29",
+        "type": "switchNode",
+        "name": "switch resource-resolution-data.status",
+        "xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1058.702751159668,
+        "y": 688.4048819541931,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "e6eea7fe.4b8c68",
+                "3be3a692.94995a"
+            ]
+        ]
+    },
+    {
+        "id": "e6eea7fe.4b8c68",
+        "type": "other",
+        "name": "SUCCESS",
+        "xml": "<outcome value='SUCCESS'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1334.0957527160645,
+        "y": 689.1191372871399,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "cf5d615a.583c3"
+            ]
+        ]
+    },
+    {
+        "id": "fc2411fd.005e",
+        "type": "for",
+        "name": "foreach capability-order[]",
+        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 423.75013732910156,
+        "y": 394.89280796051025,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "6774b97f.65aee8",
+                "18fcc384.942cfc",
+                "faba8e11.68d2e",
+                "c928b244.dc93e"
+            ]
+        ]
+    },
+    {
+        "id": "68408564.24a50c",
+        "type": "switchNode",
+        "name": "switch param capability-name == execution",
+        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1115.500373840332,
+        "y": 509.8571147918701,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "a9b07f86.fdf0f"
+            ]
+        ]
+    },
+    {
+        "id": "a9b07f86.fdf0f",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1379.000373840332,
+        "y": 510.1071147918701,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "11abb6d0.a113e9"
+            ]
+        ]
+    },
+    {
+        "id": "cf5d615a.583c3",
+        "type": "call",
+        "name": "call ss.capability-dg",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1539.214485168457,
+        "y": 688.8809885978699,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "5b6648e.97c05b8",
+                "45f1640.54b3e9c"
+            ]
+        ]
+    },
+    {
+        "id": "6774b97f.65aee8",
+        "type": "set",
+        "name": "ss.capability-name",
+        "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order[]\n-->\n",
+        "comments": "",
+        "x": 696.9643096923828,
+        "y": 326.9881229400635,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "cd2b5b6f.2c7078",
+        "type": "set",
+        "name": "tmp.param.capability-name",
+        "xml": "<set>\n<parameter name='tmp.param.capability-name' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
+        "comments": "",
+        "x": 1064.8573989868164,
+        "y": 464.4643249511719,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "18fcc384.942cfc",
+        "type": "set",
+        "name": "set ss.capability.action = unassign",
+        "xml": "<set>\n<parameter name='ss.capability-action' value='unassign' />\n",
+        "comments": "",
+        "x": 752.2498931884766,
+        "y": 368.19042587280273,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "5b6648e.97c05b8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1724.1069946289062,
+        "y": 688.8810496330261,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "46832d95.2ea054"
+            ]
+        ]
+    },
+    {
+        "id": "c928b244.dc93e",
+        "type": "set",
+        "name": "set capability-dg",
+        "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
+        "comments": "",
+        "x": 696.678581237793,
+        "y": 417.0833396911621,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "86e9d18c.321b6",
+        "type": "execute",
+        "name": "generate ss-pnf url replace service-instance-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-pnf-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-pnf-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.service-instance-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2206.9643783569336,
+        "y": 742.7627749443054,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "39d788f3.585018",
+        "type": "execute",
+        "name": "execute RestApiCallNode - PUT pnf",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.pnf.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-pnf-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-pnf\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2176.4286727905273,
+        "y": 845.619996547699,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "deb7d997.4e8ea8",
+                "bc2a882f.2a5f98"
+            ]
+        ]
+    },
+    {
+        "id": "deb7d997.4e8ea8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2451.0223388671875,
+        "y": 899.6181502342224,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "829e8ec3.e8ef3"
+            ]
+        ]
+    },
+    {
+        "id": "bc2a882f.2a5f98",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2443.450973510742,
+        "y": 846.118170261383,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "829e8ec3.e8ef3"
+            ]
+        ]
+    },
+    {
+        "id": "829e8ec3.e8ef3",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2645.583297729492,
+        "y": 845.7624249458313,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "1ed7e952.806f17"
+            ]
+        ]
+    },
+    {
+        "id": "1ed7e952.806f17",
+        "type": "configure",
+        "name": "set error-message",
+        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error persisting self-serve pnf assignments in MD-SAL during unassign\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2863.8690643310547,
+        "y": 845.9052882194519,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "485950a5.fe099",
+        "type": "set",
+        "name": "set vf data for restapi-call-node",
+        "xml": "<set>\n<parameter name='vf.pnf-id'\n    value='`$service-data.pnfs.pnf[$pnf-index].pnf-id`' />\n<parameter name='vf.pnf-data.sdnc-request-header.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.sdnc-request-header.`' />\n<parameter name='vf.pnf-data.request-information.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.request-information.`' />\n<parameter name='vf.pnf-data.service-information.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.`' />\n<parameter name='vf.pnf-data.pnf-information.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.`' />\n<parameter name='vf.pnf-data.pnf-request-input.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-request-input.`' />\n<parameter name='vf.pnf-data.pnf-request-input.pnf-input-parameters.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-request-input.pnf-input-parameters.`' />\n<parameter name='vf.pnf-data.pnf-topology.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.`' />\n<parameter name='vf.pnf-data.pnf-level-oper-status.'\n  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.`' />",
+        "comments": "",
+        "x": 2159.416679382324,
+        "y": 688.8572869300842,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "c967833c.6fc58",
+        "type": "execute",
+        "name": "generate ss-pnf url - replace pnf-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-pnf-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-pnf-url\"/>\n    <parameter name=\"target\" value=\"{pnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.pnfs.pnf[$pnf-index].pnf-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2171.25008392334,
+        "y": 793.5715432167053,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "46832d95.2ea054",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1885.059669494629,
+        "y": 688.6191611289978,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "86e9d18c.321b6",
+                "39d788f3.585018",
+                "485950a5.fe099",
+                "c967833c.6fc58",
+                "9293681d.2140f8"
+            ]
+        ]
+    },
+    {
+        "id": "9293681d.2140f8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to unassign self-serve pnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 2105.9646377563477,
+        "y": 973.3929445743561,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "4c8375f7.09675c",
+        "type": "execute",
+        "name": "printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-pnf-unassign.log' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 373.4050750732422,
+        "y": 1227.4882678985596,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "872fa153.cd35d",
+        "type": "set",
+        "name": "set ss.capability.execution-order[]",
+        "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[1]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[3]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[8]' value='generate-name' />\n<parameter name='ss.capability.execution-order_length' value='9' />",
+        "comments": "",
+        "x": 456.10718536376953,
+        "y": 187.57143020629883,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "f5aecca9.cfab2",
+        "type": "set",
+        "name": "set ss.capability-type = pnf",
+        "xml": "<set>\n<parameter name='ss.capability-type' value='pnf' />\n",
+        "comments": "",
+        "x": 435.7142868041992,
+        "y": 227.14286041259766,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "3be3a692.94995a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1324.4166145324707,
+        "y": 756.3690571784973,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "d0d9cea4.27793"
+            ]
+        ]
+    },
+    {
+        "id": "d0d9cea4.27793",
+        "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=\"`'SS: resource-resolution-data.status: ' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.status`\"/>\n<parameter name=\"field2\" value=\"`'SS: ss.capability-name: ' + $ss.capability-name`\"/>\n<parameter name=\"field3\" value=\"`'SS: tmp.param.capability-name: ' + $tmp.param.capability-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1472.523796081543,
+        "y": 756.4047627449036,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "11abb6d0.a113e9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 774.2856826782227,
+        "y": 688.5237755775452,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "b6cd64d4.f1fee8",
+                "e627cf9e.6ca29"
+            ]
+        ]
+    },
+    {
+        "id": "b6cd64d4.f1fee8",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 952.7143249511719,
+        "y": 1121.095314025879,
+        "z": "90deaa5f.ba0df8",
+        "wires": []
+    },
+    {
+        "id": "45f1640.54b3e9c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1751.607177734375,
+        "y": 874.8214378356934,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "7721b9be.729b18"
+            ]
+        ]
+    },
+    {
+        "id": "7721b9be.729b18",
+        "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: ' + $ss.capability-dg`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1895.357177734375,
+        "y": 873.5714378356934,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d136ccb4.7926b",
+        "type": "execute",
+        "name": "execute PropertiesNode",
+        "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": 844.8572213309153,
+        "y": 273.85714394705644,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "22afbf75.056c9",
+        "type": "switchNode",
+        "name": "switch prop.controller.user",
+        "xml": "<switch test='`$prop.controller.user`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 433.5714569091797,
+        "y": 274.28576469421387,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "720caa44.b3ae14"
+            ]
+        ]
+    },
+    {
+        "id": "720caa44.b3ae14",
+        "type": "failure",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 633.4285523550852,
+        "y": 273.85717923300615,
+        "z": "90deaa5f.ba0df8",
+        "wires": [
+            [
+                "d136ccb4.7926b"
+            ]
+        ]
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.json
new file mode 100644
index 00000000..42ff2a93
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.json
@@ -0,0 +1,386 @@
+[
+    {
+        "id": "ca0478b8.252088",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 142.85714721679688,
+        "y": 72.85714721679688,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "7c71ac58.1f4244"
+            ]
+        ]
+    },
+    {
+        "id": "7c71ac58.1f4244",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 418.8571472167969,
+        "y": 73.85714721679688,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "a2678c16.8e1eb"
+            ]
+        ]
+    },
+    {
+        "id": "a2678c16.8e1eb",
+        "type": "method",
+        "name": "self-serve-vf-module-generate-name-changeassign",
+        "xml": "<method rpc='self-serve-vf-module-generate-name-changeassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 323.4285583496094,
+        "y": 125.71429061889648,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "afbcafe4.6d848"
+            ]
+        ]
+    },
+    {
+        "id": "570da090.941e5",
+        "type": "execute",
+        "name": "execute NameGenerationNode-changeassign",
+        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"vf-module.changeassign.nameGenResponse\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 671.4285888671875,
+        "y": 659.2857213020325,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "551cdc4a.e86e94",
+                "ba2f7c73.31a28"
+            ]
+        ]
+    },
+    {
+        "id": "551cdc4a.e86e94",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 959.4285888671875,
+        "y": 613.2857213020325,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "7dfc16bc.be2d18"
+            ]
+        ]
+    },
+    {
+        "id": "ba2f7c73.31a28",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 965.4285888671875,
+        "y": 713.2857213020325,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "7dfc16bc.be2d18"
+            ]
+        ]
+    },
+    {
+        "id": "7dfc16bc.be2d18",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1165.4285888671875,
+        "y": 655.2857213020325,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "56db66db.f751e8",
+                "2a9c646.dc70e9c"
+            ]
+        ]
+    },
+    {
+        "id": "56db66db.f751e8",
+        "type": "set",
+        "name": "set status as FAILED",
+        "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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1374.4285888671875,
+        "y": 604.2857213020325,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "2a9c646.dc70e9c",
+        "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 NameGenerationNode ChangeAssign vf-module ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 1360.4285888671875,
+        "y": 713.2857213020325,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "afbcafe4.6d848",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 224.71428680419922,
+        "y": 562.8571300506592,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "b979f5f1.ad8358",
+                "ab950644.7d58a8",
+                "975f7bc0.f4f5d8",
+                "570da090.941e5",
+                "f212bbb9.76a8b8",
+                "1a352eb2.e4d9b1",
+                "14d9ecdc.aff013"
+            ]
+        ]
+    },
+    {
+        "id": "b979f5f1.ad8358",
+        "type": "for",
+        "name": "for service-data...vf-module...resource-key",
+        "xml": "<for index='i' 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[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 667.0000076293945,
+        "y": 375.00000858306885,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "56f43f1.46959c"
+            ]
+        ]
+    },
+    {
+        "id": "56f43f1.46959c",
+        "type": "switchNode",
+        "name": "switch resource-key[].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[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1004.8571624755859,
+        "y": 374.9999942779541,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "db5132dc.231e6"
+            ]
+        ]
+    },
+    {
+        "id": "db5132dc.231e6",
+        "type": "outcome",
+        "name": "external-key",
+        "xml": "<outcome value='external-key'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1245.857162475586,
+        "y": 374.9999942779541,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "eace8af.3827778"
+            ]
+        ]
+    },
+    {
+        "id": "eace8af.3827778",
+        "type": "set",
+        "name": "set tmp.external-key.value",
+        "xml": "<set>\n<parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />\n",
+        "comments": "",
+        "x": 1475.857162475586,
+        "y": 374.9999942779541,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "975f7bc0.f4f5d8",
+        "type": "set",
+        "name": "set tmp.vf-module.changeassign.naming-data-payload",
+        "xml": "<set>\n<parameter name=\"tmp.vf-module.changeassign.naming-data-payload\" value=\"`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`\"/>",
+        "comments": "",
+        "x": 710.2856903076172,
+        "y": 559.0000162124634,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "ab950644.7d58a8",
+        "type": "switchNode",
+        "name": "switch tmp.external-key.value",
+        "xml": "<switch test='`$tmp.external-key.value`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 619.0000076293945,
+        "y": 502.00000858306885,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "f0dcf6b8.eaab28"
+            ]
+        ]
+    },
+    {
+        "id": "f0dcf6b8.eaab28",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 846.0000076293945,
+        "y": 502.00000858306885,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "a8701ab3.e308f8"
+            ]
+        ]
+    },
+    {
+        "id": "a8701ab3.e308f8",
+        "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=\"self-service-vf-module-generate-name-changeassign error : external-key is null for vf-module\" />\n",
+        "comments": "",
+        "x": 1007.0000076293945,
+        "y": 502.00000858306885,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "fe3c1b72.b16ba8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 795.9523773193359,
+        "y": 796.0475826263428,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "a8ee0931.de9688"
+            ]
+        ]
+    },
+    {
+        "id": "a8ee0931.de9688",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 977.8571929931641,
+        "y": 834.5714569091797,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "73245796.36c418",
+                "b4c5b7d.9734d48"
+            ]
+        ]
+    },
+    {
+        "id": "73245796.36c418",
+        "type": "set",
+        "name": "set status as FAILED",
+        "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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1192.857192993164,
+        "y": 794.5714569091797,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "b4c5b7d.9734d48",
+        "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=\"`'Failed to update vf-module.vf-module-name to ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`\" />\n",
+        "comments": "",
+        "x": 1180.857192993164,
+        "y": 882.5714569091797,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "1a352eb2.e4d9b1",
+        "type": "set",
+        "name": "set param[].value and status",
+        "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[$ss.service-data.param.index].value`' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`'/>\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[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />",
+        "comments": "",
+        "x": 629.5714416503906,
+        "y": 1023.1428661346436,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    },
+    {
+        "id": "f212bbb9.76a8b8",
+        "type": "save",
+        "name": "update vf-module",
+        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vf-module\" key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \" > \n<parameter name=\"vf-module-name\" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 598.2698364257812,
+        "y": 835.0161256790161,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "fe3c1b72.b16ba8",
+                "658b3ee2.d2b67"
+            ]
+        ]
+    },
+    {
+        "id": "658b3ee2.d2b67",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 793.5079803466797,
+        "y": 882.1586666107178,
+        "z": "7da44d34.41b8e4",
+        "wires": [
+            [
+                "a8ee0931.de9688"
+            ]
+        ]
+    },
+    {
+        "id": "14d9ecdc.aff013",
+        "type": "set",
+        "name": "set tmp.external-key.value = NULL",
+        "xml": "<set>\n<parameter name='tmp.external-key.value' value='' />\n",
+        "comments": "",
+        "x": 638.5714263916016,
+        "y": 321.42858600616455,
+        "z": "7da44d34.41b8e4",
+        "wires": []
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.json
new file mode 100644
index 00000000..715b2736
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.json
@@ -0,0 +1,1642 @@
+[
+    {
+        "id": "e84bfbbb.718608",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 141.25,
+        "y": 45,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "27327715.bee628"
+            ]
+        ]
+    },
+    {
+        "id": "27327715.bee628",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 393.8213806152344,
+        "y": 44.428558349609375,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "46690c35.cecfd4"
+            ]
+        ]
+    },
+    {
+        "id": "46690c35.cecfd4",
+        "type": "method",
+        "name": "self-serve-vf-module-generate-name",
+        "xml": "<method rpc='self-serve-vf-module-generate-name' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 264.05955505371094,
+        "y": 106.333327293396,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "6114d73f.423e38"
+            ]
+        ]
+    },
+    {
+        "id": "a146bb83.82a0b8",
+        "type": "switchNode",
+        "name": "switch capability action",
+        "xml": "<switch test=\"`$ss.capability-action`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 331.7142028808594,
+        "y": 880.9762096405029,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "e24bc2f2.db491",
+                "94253430.072878"
+            ]
+        ]
+    },
+    {
+        "id": "e24bc2f2.db491",
+        "type": "not-found",
+        "name": "unassign",
+        "xml": "<outcome value='unassign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 557.0119094848633,
+        "y": 260.7380905151367,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "e82d9fdf.5f262"
+            ]
+        ]
+    },
+    {
+        "id": "6114d73f.423e38",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 245.18649291992188,
+        "y": 172.206392288208,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "a146bb83.82a0b8",
+                "4d017d4c.7600e4"
+            ]
+        ]
+    },
+    {
+        "id": "94253430.072878",
+        "type": "not-found",
+        "name": "assign",
+        "xml": "<outcome value='assign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 529.603157043457,
+        "y": 1514.535545349121,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "4aed50aa.bd34b"
+            ]
+        ]
+    },
+    {
+        "id": "f3054564.8dee78",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1283.3334274291992,
+        "y": 728.3333501815796,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a545ef92.a752",
+        "type": "for",
+        "name": "for vf-module-parameters",
+        "xml": "<for index='i' 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": 975.1665954589844,
+        "y": 318.6671676635742,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "ae9b45ff.13aa28"
+            ]
+        ]
+    },
+    {
+        "id": "ae9b45ff.13aa28",
+        "type": "switchNode",
+        "name": "switch capability-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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1255.1665954589844,
+        "y": 318.6671676635742,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b9e1ae63.38de5"
+            ]
+        ]
+    },
+    {
+        "id": "b9e1ae63.38de5",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1464.1667175292969,
+        "y": 318.6671676635742,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "d5db7c2d.5d5de"
+            ]
+        ]
+    },
+    {
+        "id": "1e50adf4.9b4d42",
+        "type": "for",
+        "name": "for vf-module-parameters",
+        "xml": "<for index='j' 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[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1274.5000534057617,
+        "y": 521.0000610351562,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "c1e0ef7d.fceca"
+            ]
+        ]
+    },
+    {
+        "id": "b94b4eca.42c3a",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" 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[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" 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[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
+        "comments": "",
+        "x": 1877.0000534057617,
+        "y": 519.0000610351562,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "6105637d.c28fdc",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
+        "comments": "",
+        "x": 1292.0000457763672,
+        "y": 454.0000286102295,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "a7b567fa.b60c18",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+        "comments": "",
+        "x": 1250.3334274291992,
+        "y": 591.3333501815796,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "f42c069c.3234d8",
+        "type": "set",
+        "name": "set close payload list",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
+        "comments": "",
+        "x": 1256.3334274291992,
+        "y": 656.3333501815796,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "c16b7168.9953c",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1286.3334274291992,
+        "y": 782.3333501815796,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "69dc08d7.120c38",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1626.3335571289062,
+        "y": 886.0001163482666,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "8db09167.c1c35"
+            ]
+        ]
+    },
+    {
+        "id": "70f1338a.4429cc",
+        "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 NameGenerationNode Unassign\" />\n",
+        "comments": "",
+        "x": 2020.3335571289062,
+        "y": 986.0001163482666,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "4892f279.12f7dc",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1631.3335571289062,
+        "y": 985.0001163482666,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "8db09167.c1c35"
+            ]
+        ]
+    },
+    {
+        "id": "8db09167.c1c35",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1807.9049835205078,
+        "y": 932.8572578430176,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "e77f3b3e.260848",
+                "70f1338a.4429cc"
+            ]
+        ]
+    },
+    {
+        "id": "e77f3b3e.260848",
+        "type": "set",
+        "name": "set status as FAILED",
+        "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[$i].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 2034.3335571289062,
+        "y": 877.0001163482666,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "4f4ff4c3.3fdccc",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1262.3335494995117,
+        "y": 1120.6666717529297,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d5db7c2d.5d5de",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 995.0001029968262,
+        "y": 452.00000762939453,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "6105637d.c28fdc",
+                "1e50adf4.9b4d42",
+                "a7b567fa.b60c18",
+                "f42c069c.3234d8",
+                "f3054564.8dee78",
+                "4f4ff4c3.3fdccc",
+                "c16b7168.9953c",
+                "59d89928.757ce8",
+                "750564ef.62aaac",
+                "a905c3e.9b98b4",
+                "42f87bad.5e21a4",
+                "1378d748.6067b9"
+            ]
+        ]
+    },
+    {
+        "id": "c1e0ef7d.fceca",
+        "type": "switchNode",
+        "name": "switch external-key",
+        "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[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1513.0000534057617,
+        "y": 520.0000610351562,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "5f8e2924.139af8"
+            ]
+        ]
+    },
+    {
+        "id": "5f8e2924.139af8",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1697.0000534057617,
+        "y": 520.0000610351562,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b94b4eca.42c3a"
+            ]
+        ]
+    },
+    {
+        "id": "a49850b9.7de62",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1410.4999694824219,
+        "y": 1877.918339729309,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e350cd4f.89128",
+        "type": "for",
+        "name": "for vf-module-parameters",
+        "xml": "<for index='j' 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[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1895.4165344238281,
+        "y": 1582.3345394134521,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "461f7009.31252"
+            ]
+        ]
+    },
+    {
+        "id": "461f7009.31252",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" 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[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" 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[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
+        "comments": "",
+        "x": 2151.916534423828,
+        "y": 1582.3345394134521,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "77ed14f0.1e50fc",
+        "type": "set",
+        "name": "set set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+        "comments": "",
+        "x": 1877.9165344238281,
+        "y": 1528.3345394134521,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "dfcb1ceb.9bec1",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
+        "comments": "",
+        "x": 1870.5831604003906,
+        "y": 1642.6679525375366,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "7a57066b.2add18",
+        "type": "set",
+        "name": "set close payload list",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
+        "comments": "",
+        "x": 1380.500099182129,
+        "y": 1810.2515354156494,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "c76f71d.3fbea9",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1413.4999694824219,
+        "y": 1931.918339729309,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a5e78811.2ff3a8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1726.4999771118164,
+        "y": 2057.5850505828857,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "d25aa272.8015c"
+            ]
+        ]
+    },
+    {
+        "id": "e2d27def.fb7c8",
+        "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 NameGenerationNode Assign\" />\n",
+        "comments": "",
+        "x": 2091.4999771118164,
+        "y": 2157.5850505828857,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "ec9a39ae.283a08",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1731.4999771118164,
+        "y": 2156.5850505828857,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "d25aa272.8015c"
+            ]
+        ]
+    },
+    {
+        "id": "d25aa272.8015c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1889.4999771118164,
+        "y": 2101.5850505828857,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "e2d27def.fb7c8",
+                "276a7d7f.ba8d72"
+            ]
+        ]
+    },
+    {
+        "id": "276a7d7f.ba8d72",
+        "type": "set",
+        "name": "set status as FAILED",
+        "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[$i].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 2105.4999771118164,
+        "y": 2048.5850505828857,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "a3966104.f08e7",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1386.1667175292969,
+        "y": 2283.2520456314087,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3971e600.d8d9fa",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1642.5833129882812,
+        "y": 1581.3345775604248,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "e350cd4f.89128",
+                "77ed14f0.1e50fc",
+                "dfcb1ceb.9bec1"
+            ]
+        ]
+    },
+    {
+        "id": "eaf1cf2e.82906",
+        "type": "set",
+        "name": "set status as SUCCESS",
+        "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[$i].resource-resolution-data.status`' value='SUCCESS' />",
+        "comments": "",
+        "x": 3197.2139434814453,
+        "y": 2205.4898414611816,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "ebdc7fff.ef0a3",
+        "type": "for",
+        "name": "for vnf-parameters data",
+        "xml": "<for index='cn' 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": 2448.1666412353516,
+        "y": 2292.918468475342,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "fab36c9c.cfd6"
+            ]
+        ]
+    },
+    {
+        "id": "fab36c9c.cfd6",
+        "type": "switchNode",
+        "name": "switch param[] 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[$cn].name == 'vnfc-name'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2701.6666412353516,
+        "y": 2293.9188346862793,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "2b9649be.3888a6"
+            ]
+        ]
+    },
+    {
+        "id": "2b9649be.3888a6",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2894.6666412353516,
+        "y": 2294.418712615967,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "bf73571d.0cab48"
+            ]
+        ]
+    },
+    {
+        "id": "bf73571d.0cab48",
+        "type": "for",
+        "name": "for j in resource key",
+        "xml": "<for silentFailure='true' index='j' 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[$cn].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3070.214267730713,
+        "y": 2294.871190071106,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "65cb4145.fef09"
+            ]
+        ]
+    },
+    {
+        "id": "65cb4145.fef09",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3267.452404022217,
+        "y": 2296.5850582122803,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "dc43b4ed.4a3188",
+                "74bd7b58.2c4ec4",
+                "ef6ac3b9.1f0ac",
+                "c45ccc74.2757f",
+                "2bb85a57.97bc86",
+                "94d99538.8a9d28",
+                "b788ec8b.95acd"
+            ]
+        ]
+    },
+    {
+        "id": "74bd7b58.2c4ec4",
+        "type": "switchNode",
+        "name": "switch model-invariant-uuid",
+        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-invariant-uuid'`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3558.3094024658203,
+        "y": 2161.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b7662f86.cab36"
+            ]
+        ]
+    },
+    {
+        "id": "ef6ac3b9.1f0ac",
+        "type": "switchNode",
+        "name": "switch model-customization-uuid",
+        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-customization-uuid'`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3526.3094024658203,
+        "y": 2219.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "29f21450.554fdc"
+            ]
+        ]
+    },
+    {
+        "id": "c45ccc74.2757f",
+        "type": "switchNode",
+        "name": "switch model-uuid",
+        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-uuid'`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3524.3094024658203,
+        "y": 2281.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "525fa047.26849"
+            ]
+        ]
+    },
+    {
+        "id": "2bb85a57.97bc86",
+        "type": "switchNode",
+        "name": "switch model-version",
+        "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[$cn].resource-resolution-data.resource-key[$j].name == 'model-version'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3532.3094024658203,
+        "y": 2343.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "764617a1.0f59f8"
+            ]
+        ]
+    },
+    {
+        "id": "dc43b4ed.4a3188",
+        "type": "switchNode",
+        "name": "switch vm-type",
+        "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[$cn].resource-resolution-data.resource-key[$j].name == 'vm-type'`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3548.3094024658203,
+        "y": 2089.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "51eeee44.62fc3"
+            ]
+        ]
+    },
+    {
+        "id": "51eeee44.62fc3",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3752.3094024658203,
+        "y": 2085.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "3fb4c41.cc64a3c"
+            ]
+        ]
+    },
+    {
+        "id": "b7662f86.cab36",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3752.3094024658203,
+        "y": 2159.4063816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "6c1e2846.ea8778"
+            ]
+        ]
+    },
+    {
+        "id": "29f21450.554fdc",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3758.3094024658203,
+        "y": 2215.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "25ee6281.39852e"
+            ]
+        ]
+    },
+    {
+        "id": "525fa047.26849",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3762.3094024658203,
+        "y": 2273.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b82557fc.5077f8"
+            ]
+        ]
+    },
+    {
+        "id": "764617a1.0f59f8",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3768.3094024658203,
+        "y": 2339.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b6c3468b.b83238"
+            ]
+        ]
+    },
+    {
+        "id": "3fb4c41.cc64a3c",
+        "type": "set",
+        "name": "set vm-type",
+        "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-assignments.vms.vm[0].vm-type`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
+        "comments": "",
+        "x": 3916.3094024658203,
+        "y": 2087.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "6c1e2846.ea8778",
+        "type": "set",
+        "name": "set model-invariant-uuid",
+        "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-assignments.vms.vm[0].onap-model-information.model-invariant-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
+        "comments": "",
+        "x": 3962.3094024658203,
+        "y": 2153.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "25ee6281.39852e",
+        "type": "set",
+        "name": "set model-customization-uuid",
+        "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-assignments.vms.vm[0].onap-model-information.model-customization-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
+        "comments": "",
+        "x": 4006.3094024658203,
+        "y": 2217.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "b82557fc.5077f8",
+        "type": "set",
+        "name": "set model-uuid",
+        "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-assignments.vms.vm[0].onap-model-information.model-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
+        "comments": "",
+        "x": 3982.3094024658203,
+        "y": 2271.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "b6c3468b.b83238",
+        "type": "set",
+        "name": "set model-version",
+        "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-assignments.vms.vm[0].onap-model-information.model-version`' 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[$cn].resource-resolution-data.resource-key[j].value`' />\n",
+        "comments": "",
+        "x": 3928.3094024658203,
+        "y": 2337.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "1de73fc.a7c00c",
+        "type": "set",
+        "name": "set model-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-assignments.vms.vm[0].onap-model-information.model-name`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
+        "comments": "",
+        "x": 3934.3094024658203,
+        "y": 2393.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "348bf42b.21ddbc",
+        "type": "set",
+        "name": "set  vnfc-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-assignments.vms.vm[0].vm-names.vnfc-names[0].vnfc-name`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />\n",
+        "comments": "",
+        "x": 3952.3094024658203,
+        "y": 2449.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "94d99538.8a9d28",
+        "type": "switchNode",
+        "name": "switch model-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[$cn].resource-resolution-data.resource-key[$j].name == 'model-name'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3532.3094024658203,
+        "y": 2395.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b9ea57b4.6ce108"
+            ]
+        ]
+    },
+    {
+        "id": "b788ec8b.95acd",
+        "type": "switchNode",
+        "name": "switch vnfc-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[$cn].resource-resolution-data.resource-key[$j].name == 'vnfc-name'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3530.3094024658203,
+        "y": 2449.1563816070557,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "434a8283.7cea2c"
+            ]
+        ]
+    },
+    {
+        "id": "b9ea57b4.6ce108",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3766.3094024658203,
+        "y": 2393.1563816070548,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "1de73fc.a7c00c"
+            ]
+        ]
+    },
+    {
+        "id": "434a8283.7cea2c",
+        "type": "success",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3760.3094024658203,
+        "y": 2447.1563816070548,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "348bf42b.21ddbc"
+            ]
+        ]
+    },
+    {
+        "id": "ed9a3855.ee7828",
+        "type": "for",
+        "name": "for vf-module-parameters",
+        "xml": "<for index='i' 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": 947.0475769042969,
+        "y": 1580.9055223464966,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "d5d54e6c.65aa3"
+            ]
+        ]
+    },
+    {
+        "id": "d5d54e6c.65aa3",
+        "type": "switchNode",
+        "name": "switch capability-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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1227.0475769042969,
+        "y": 1580.9055223464966,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "a7e6af82.f996b"
+            ]
+        ]
+    },
+    {
+        "id": "a7e6af82.f996b",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1436.0476989746094,
+        "y": 1580.9055223464966,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "3971e600.d8d9fa"
+            ]
+        ]
+    },
+    {
+        "id": "4aed50aa.bd34b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 698.0475769042969,
+        "y": 1513.9052782058716,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "23e78efe.1e9da2",
+                "ed9a3855.ee7828",
+                "3dd1b4b3.2a22fc"
+            ]
+        ]
+    },
+    {
+        "id": "23e78efe.1e9da2",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
+        "comments": "",
+        "x": 968.3809356689453,
+        "y": 1512.9052925109863,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "3dd1b4b3.2a22fc",
+        "type": "switchNode",
+        "name": "switch tmp.naming-data-payload is null",
+        "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 977.297607421875,
+        "y": 1703.405400276184,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "a82bc6f5.75a5f8"
+            ]
+        ]
+    },
+    {
+        "id": "a82bc6f5.75a5f8",
+        "type": "not-found",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1211.0476379394531,
+        "y": 1703.155156135559,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "601f05f5.bbe91c"
+            ]
+        ]
+    },
+    {
+        "id": "601f05f5.bbe91c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 992.1309661865234,
+        "y": 1820.4055080413818,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "7a57066b.2add18",
+                "a49850b9.7de62",
+                "c76f71d.3fbea9",
+                "a3966104.f08e7",
+                "29b82897.e9cf48",
+                "571c0bc8.cea834",
+                "9b679da3.35f9b",
+                "5470ee78.282f2"
+            ]
+        ]
+    },
+    {
+        "id": "29b82897.e9cf48",
+        "type": "execute",
+        "name": "execute RestApiCallNode - POST gen-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1449.1904907226562,
+        "y": 2105.000608444214,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "a5e78811.2ff3a8",
+                "ec9a39ae.283a08"
+            ]
+        ]
+    },
+    {
+        "id": "59d89928.757ce8",
+        "type": "execute",
+        "name": "execute RestApiCallNode - DELETE gen-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1335.8572387695312,
+        "y": 933.6671085357666,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "69dc08d7.120c38",
+                "4892f279.12f7dc"
+            ]
+        ]
+    },
+    {
+        "id": "4d017d4c.7600e4",
+        "type": "set",
+        "name": "set vf-module pathname for context logging",
+        "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-gen-name-' + \n\t$ss.capability-type + '-' + $ss.capability-action + '-' + \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": 591.6666107177734,
+        "y": 171.6666660308838,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "e82d9fdf.5f262",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 745,
+        "y": 260,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "478998aa.bb7da8",
+                "a545ef92.a752"
+            ]
+        ]
+    },
+    {
+        "id": "478998aa.bb7da8",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
+        "comments": "",
+        "x": 996.25,
+        "y": 261.249998729676,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "750564ef.62aaac",
+        "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 namegeneration.node.UnAssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1208.3333587646484,
+        "y": 846.666618347168,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a905c3e.9b98b4",
+        "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 namegeneration.node.UnAssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1203.3335037231445,
+        "y": 1046.9999990463257,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fcce16b2.b965d8",
+        "type": "switchNode",
+        "name": "switch resource-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[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1484.4765548706055,
+        "y": 1254.9998054504395,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "85bc6cce.ab7f4"
+            ]
+        ]
+    },
+    {
+        "id": "85bc6cce.ab7f4",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1684.4765548706055,
+        "y": 1254.9998054504395,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b81fd5a3.92d438"
+            ]
+        ]
+    },
+    {
+        "id": "b81fd5a3.92d438",
+        "type": "set",
+        "name": "set set payload 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[$i].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
+        "comments": "",
+        "x": 1868.9765548706055,
+        "y": 1253.9998054504395,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "1378d748.6067b9",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1246.4766387939453,
+        "y": 1255.9996490478516,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "fcce16b2.b965d8"
+            ]
+        ]
+    },
+    {
+        "id": "42f87bad.5e21a4",
+        "type": "set",
+        "name": "set status as DELETED",
+        "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[$i].resource-resolution-data.status`' value='DELETED' />",
+        "comments": "",
+        "x": 1253.143295288086,
+        "y": 1184.9996395111084,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "85df345.38740c8",
+        "type": "for",
+        "name": "for vf-module-parameters",
+        "xml": "<for index='l' 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": 1613.3333740234375,
+        "y": 2413.333212852478,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "64f8f6b9.a1feb8"
+            ]
+        ]
+    },
+    {
+        "id": "853ff87a.09eed8",
+        "type": "set",
+        "name": "set param value and status",
+        "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[$l].value`' value=\"`$jsonContextPrefix.elements[$n].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[$l].resource-resolution-data.status`' value='SUCCESS' />",
+        "comments": "",
+        "x": 2252.404800415039,
+        "y": 2412.3328819274902,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "5470ee78.282f2",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1372.3333740234375,
+        "y": 2413.333212852478,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "85df345.38740c8"
+            ]
+        ]
+    },
+    {
+        "id": "64f8f6b9.a1feb8",
+        "type": "switchNode",
+        "name": "switch resource-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[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1860.5953216552734,
+        "y": 2413.748378753662,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "6af1485d.34fc68"
+            ]
+        ]
+    },
+    {
+        "id": "6af1485d.34fc68",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2050.595230102539,
+        "y": 2412.7484092712402,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "853ff87a.09eed8"
+            ]
+        ]
+    },
+    {
+        "id": "dd551169.136f",
+        "type": "for",
+        "name": "for vf-module-parameters",
+        "xml": "<for index='l' 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": 2874.8333129882812,
+        "y": 2656.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b700081f.a5af38"
+            ]
+        ]
+    },
+    {
+        "id": "9a9af9bb.35f3a8",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3045.8333129882812,
+        "y": 2814.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "fa7a3c8b.7c266"
+            ]
+        ]
+    },
+    {
+        "id": "fa7a3c8b.7c266",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3249.8333129882812,
+        "y": 2812.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "1ecffe89.85c4b1"
+            ]
+        ]
+    },
+    {
+        "id": "1ecffe89.85c4b1",
+        "type": "set",
+        "name": "set set payload 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[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
+        "comments": "",
+        "x": 3444.3333129882812,
+        "y": 2745.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "488888f7.9630a8",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2606.8333129882812,
+        "y": 2657.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "dd551169.136f"
+            ]
+        ]
+    },
+    {
+        "id": "b700081f.a5af38",
+        "type": "execute",
+        "name": "slistringUtils - check value for $",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3158.8333129882812,
+        "y": 2660.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "9924b99e.500128"
+            ]
+        ]
+    },
+    {
+        "id": "9924b99e.500128",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3386.8333129882812,
+        "y": 2657.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "29b06b2c.c02b94"
+            ]
+        ]
+    },
+    {
+        "id": "1143f2e4.dc38ad",
+        "type": "execute",
+        "name": "split resource-resolution-data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='resource-resolution-split' />\n   <parameter name='original_string' 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[$l].value`' />\n   <parameter name='regex' value='\\$\\{' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3053.8333129882812,
+        "y": 2710.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ef40c4de.fc57e8",
+        "type": "execute",
+        "name": "split resource-resolution-split-1",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='s2' />\n   <parameter name='original_string' value='`$resource-resolution-split[1]`' />\n   <parameter name='regex' value='\\}' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3066.8333129882812,
+        "y": 2769.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "29b06b2c.c02b94",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2813.8333129882812,
+        "y": 2736.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "9a9af9bb.35f3a8",
+                "1143f2e4.dc38ad",
+                "ef40c4de.fc57e8"
+            ]
+        ]
+    },
+    {
+        "id": "f015a67f.2123d8",
+        "type": "for",
+        "name": "for vnf parameters data",
+        "xml": "<for index='l' 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": 2601.8333129882812,
+        "y": 2879.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "db9bf599.422b48"
+            ]
+        ]
+    },
+    {
+        "id": "db9bf599.422b48",
+        "type": "execute",
+        "name": "slistringUtils - check value for $",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >\n    <parameter name=\"source\" 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[$l].value`\" />\n    <parameter name=\"target\" value=\"$\"/>\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2907.8333129882812,
+        "y": 2877.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "b6fbb194.9aa76"
+            ]
+        ]
+    },
+    {
+        "id": "b6fbb194.9aa76",
+        "type": "failure",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3145.8333129882812,
+        "y": 2877.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "f09b7610.befed8"
+            ]
+        ]
+    },
+    {
+        "id": "f09b7610.befed8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3307.8333129882812,
+        "y": 2871.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            [
+                "d0008718.c841e8",
+                "c01ede3a.c48f6"
+            ]
+        ]
+    },
+    {
+        "id": "d0008718.c841e8",
+        "type": "set",
+        "name": "set capability 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[$l].resource-resolution-data.capability-name`' value='INPUT' />\n",
+        "comments": "",
+        "x": 3531.8333129882812,
+        "y": 2837.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "c01ede3a.c48f6",
+        "type": "set",
+        "name": "set status SUCCESS",
+        "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[$l].resource-resolution-data.status`' value='SUCCESS' />\n\t",
+        "comments": "",
+        "x": 3519.8333129882812,
+        "y": 2937.918480873108,
+        "z": "4b1f76da.0625d8",
+        "wires": []
+    },
+    {
+        "id": "571c0bc8.cea834",
+        "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 namegeneration.node.AssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1333.333251953125,
+        "y": 2021.6666259765625,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9b679da3.35f9b",
+        "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 namegeneration.node.AssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1334.9996719360352,
+        "y": 2181.666796684265,
+        "z": "4b1f76da.0625d8",
+        "wires": [
+            []
+        ]
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.json
index 6cbadd20..368cd699 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.json
@@ -1,381 +1,381 @@
-[
-    {
-        "id": "f70303c0.672d3",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 104,
-        "y": 45,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "b30ec3af.cbe5d"
-            ]
-        ]
-    },
-    {
-        "id": "b30ec3af.cbe5d",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 380,
-        "y": 46,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "dd0487fb.01a09"
-            ]
-        ]
-    },
-    {
-        "id": "dd0487fb.01a09",
-        "type": "method",
-        "name": "self-serve-vfmodule-changeassign ",
-        "xml": "<method rpc='self-serve-vfmodule-changeassign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 713,
-        "y": 47,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "ced5c4eb.661a9"
-            ]
-        ]
-    },
-    {
-        "id": "ced5c4eb.661a9",
-        "type": "block",
-        "name": "block atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 122.5,
-        "y": 128,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "ae1af1b3.fcf59",
-                "e4e58c8c.cef7c8"
-            ]
-        ]
-    },
-    {
-        "id": "f3250dd4.8f7b3",
-        "type": "set",
-        "name": "set",
-        "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[$j].resource-resolution-data.status`' value='PENDING'/>\n   <parameter name='ss.input.param.index' value='`$i`' />\n   <parameter name='ss.service-data.param.index' value='`$j`' />\n   <parameter name='ss.input.param.found.in.service.param' value='true' />\n   <parameter name='ss.capability-type' value='vf-module' />\n   <parameter name='ss.capability-action' value='changeassign' />",
-        "comments": "",
-        "x": 2051,
-        "y": 395,
-        "z": "726449b2.4963",
-        "wires": []
-    },
-    {
-        "id": "ae1af1b3.fcf59",
-        "type": "switchNode",
-        "name": "switch vf-module-input-parameters",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 365,
-        "y": 171,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "85ade545.2ec22"
-            ]
-        ]
-    },
-    {
-        "id": "85ade545.2ec22",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 595.1428833007812,
-        "y": 170.85714721679688,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "4c3d2e9.5bda2d"
-            ]
-        ]
-    },
-    {
-        "id": "4c3d2e9.5bda2d",
-        "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 param name/value provided in vf-module-request-input\" />\n",
-        "comments": "",
-        "x": 768,
-        "y": 171,
-        "z": "726449b2.4963",
-        "wires": []
-    },
-    {
-        "id": "e4e58c8c.cef7c8",
-        "type": "for",
-        "name": "for vf-module-input-parameters.param index i",
-        "xml": "<for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 398,
-        "y": 240,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "142575c6.6caafa"
-            ]
-        ]
-    },
-    {
-        "id": "142575c6.6caafa",
-        "type": "switchNode",
-        "name": "switch service param length null",
-        "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\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 754,
-        "y": 241,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "6ebd9074.f07218"
-            ]
-        ]
-    },
-    {
-        "id": "6ebd9074.f07218",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 988,
-        "y": 240,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "e0ed93ed.b2b8b"
-            ]
-        ]
-    },
-    {
-        "id": "590e174a.65d8a",
-        "type": "for",
-        "name": "for service-data.vnf-parameters-data.param index j",
-        "xml": "<for index='j' 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`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1162,
-        "y": 394,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "ac5e4634.0b2448"
-            ]
-        ]
-    },
-    {
-        "id": "ac5e4634.0b2448",
-        "type": "switchNode",
-        "name": "switch match for 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[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1503,
-        "y": 395,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "f7d97b3d.e60038"
-            ]
-        ]
-    },
-    {
-        "id": "f7d97b3d.e60038",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1698,
-        "y": 394,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "deae5a01.337f58"
-            ]
-        ]
-    },
-    {
-        "id": "e69f3b51.b837b8",
-        "type": "not-found",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1301,
-        "y": 473,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "c754e2e.93a8ba"
-            ]
-        ]
-    },
-    {
-        "id": "c754e2e.93a8ba",
-        "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 param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`\" />\n",
-        "comments": "",
-        "x": 1450,
-        "y": 472,
-        "z": "726449b2.4963",
-        "wires": []
-    },
-    {
-        "id": "deae5a01.337f58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1854,
-        "y": 395,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "f3250dd4.8f7b3",
-                "c0d5c4ec.a72a3",
-                "3af469f6.38cc1e"
-            ]
-        ]
-    },
-    {
-        "id": "c0d5c4ec.a72a3",
-        "type": "call",
-        "name": "call self-serve-generate-name-changeassign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2160,
-        "y": 458,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "e0b4c040.c1636",
-                "a668b860.256a88"
-            ]
-        ]
-    },
-    {
-        "id": "e0b4c040.c1636",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2436,
-        "y": 422,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "e7042dd5.9e899"
-            ]
-        ]
-    },
-    {
-        "id": "a668b860.256a88",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2438,
-        "y": 490,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "e7042dd5.9e899"
-            ]
-        ]
-    },
-    {
-        "id": "e7042dd5.9e899",
-        "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 self-service-generate-name-changeassign\" />\n",
-        "comments": "",
-        "x": 2626,
-        "y": 452,
-        "z": "726449b2.4963",
-        "wires": []
-    },
-    {
-        "id": "e0ed93ed.b2b8b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 838,
-        "y": 313,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "12c4ca5c.0c4496",
-                "590e174a.65d8a",
-                "d31f5e36.31a7c8"
-            ]
-        ]
-    },
-    {
-        "id": "12c4ca5c.0c4496",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n   <parameter name='ss.input.param.found.in.service.param' value='false' />",
-        "comments": "",
-        "x": 1029,
-        "y": 313,
-        "z": "726449b2.4963",
-        "wires": []
-    },
-    {
-        "id": "3af469f6.38cc1e",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n",
-        "comments": "",
-        "x": 2081,
-        "y": 535,
-        "z": "726449b2.4963",
-        "wires": []
-    },
-    {
-        "id": "d31f5e36.31a7c8",
-        "type": "switchNode",
-        "name": "switch if found vnf_name",
-        "xml": "<switch test='`$ss.input.param.found.in.service.param`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1081,
-        "y": 473,
-        "z": "726449b2.4963",
-        "wires": [
-            [
-                "e69f3b51.b837b8"
-            ]
-        ]
-    }
+[
+    {
+        "id": "db5642bb.db1e5",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 121.42855834960938,
+        "y": 57.14285659790039,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "57e37eb4.944e6"
+            ]
+        ]
+    },
+    {
+        "id": "57e37eb4.944e6",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 397.4285583496094,
+        "y": 58.14285659790039,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "f841c0f6.c5f5b"
+            ]
+        ]
+    },
+    {
+        "id": "f841c0f6.c5f5b",
+        "type": "method",
+        "name": "self-serve-vfmodule-changeassign ",
+        "xml": "<method rpc='self-serve-vfmodule-changeassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 314.7143249511719,
+        "y": 102.00000286102295,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "d9f3cb74.bcc858"
+            ]
+        ]
+    },
+    {
+        "id": "d9f3cb74.bcc858",
+        "type": "block",
+        "name": "block atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 258.5,
+        "y": 161.5714225769043,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "cfddaee8.3580a",
+                "dfdf0e15.940d8"
+            ]
+        ]
+    },
+    {
+        "id": "1e86b28e.b1457d",
+        "type": "set",
+        "name": "set",
+        "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[$j].resource-resolution-data.status`' value='PENDING'/>\n   <parameter name='ss.input.param.index' value='`$i`' />\n   <parameter name='ss.service-data.param.index' value='`$j`' />\n   <parameter name='ss.input.param.found.in.service.param' value='true' />\n   <parameter name='ss.capability-type' value='vf-module' />\n   <parameter name='ss.capability-action' value='changeassign' />",
+        "comments": "",
+        "x": 1777.0000457763672,
+        "y": 570.0000133514404,
+        "z": "2d052f87.5609f",
+        "wires": []
+    },
+    {
+        "id": "cfddaee8.3580a",
+        "type": "switchNode",
+        "name": "switch vf-module-input-parameters",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 533.8571472167969,
+        "y": 208.8571367263794,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "6098f169.8c4d9"
+            ]
+        ]
+    },
+    {
+        "id": "6098f169.8c4d9",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 764.0000305175781,
+        "y": 208.71428394317627,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "39cfb934.d0b286"
+            ]
+        ]
+    },
+    {
+        "id": "39cfb934.d0b286",
+        "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 param name/value provided in vf-module-request-input\" />\n",
+        "comments": "",
+        "x": 936.8571472167969,
+        "y": 208.8571367263794,
+        "z": "2d052f87.5609f",
+        "wires": []
+    },
+    {
+        "id": "dfdf0e15.940d8",
+        "type": "for",
+        "name": "for vf-module-input-parameters.param index i",
+        "xml": "<for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 566.8571472167969,
+        "y": 278.8571367263794,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "60302596.50a3ac"
+            ]
+        ]
+    },
+    {
+        "id": "60302596.50a3ac",
+        "type": "switchNode",
+        "name": "switch service param length null",
+        "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\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 922.8571472167969,
+        "y": 278.8571367263794,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "fd980afc.22cc08"
+            ]
+        ]
+    },
+    {
+        "id": "fd980afc.22cc08",
+        "type": "other",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1156.8571472167969,
+        "y": 278.8571367263794,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "2de6b8a9.5ab508"
+            ]
+        ]
+    },
+    {
+        "id": "2396d4ed.eaa96c",
+        "type": "for",
+        "name": "for service-data.vnf-parameters-data.param index j",
+        "xml": "<for index='j' 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`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 879.4286499023438,
+        "y": 569.0000162124634,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "90ff1c3.259f4e"
+            ]
+        ]
+    },
+    {
+        "id": "90ff1c3.259f4e",
+        "type": "switchNode",
+        "name": "switch match for 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[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1229.0000457763672,
+        "y": 570.0000133514404,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "164a17a8.3d4a38"
+            ]
+        ]
+    },
+    {
+        "id": "164a17a8.3d4a38",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1424.0000457763672,
+        "y": 569.0000133514404,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "459bcced.4174b4"
+            ]
+        ]
+    },
+    {
+        "id": "f4c49db0.aa1a",
+        "type": "not-found",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1131.285758972168,
+        "y": 859.4285659790039,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "67f318f2.47e6a8"
+            ]
+        ]
+    },
+    {
+        "id": "67f318f2.47e6a8",
+        "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-module-request-input.vf-module-input-parameters.param[].name found in service-data.\" />\n",
+        "comments": "",
+        "x": 1278.8572082519531,
+        "y": 857.0000019073486,
+        "z": "2d052f87.5609f",
+        "wires": []
+    },
+    {
+        "id": "459bcced.4174b4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1580.0000457763672,
+        "y": 570.0000133514404,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "1e86b28e.b1457d",
+                "c4c15254.21d5f",
+                "894750cd.34691"
+            ]
+        ]
+    },
+    {
+        "id": "c4c15254.21d5f",
+        "type": "call",
+        "name": "call self-serve-generate-name-changeassign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1917.4285278320312,
+        "y": 641.5714178085327,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "6693964c.555518",
+                "6b9a9290.f4c99c"
+            ]
+        ]
+    },
+    {
+        "id": "6693964c.555518",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2244.857208251953,
+        "y": 609.8572025299072,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "3db94b2d.c6d2b4"
+            ]
+        ]
+    },
+    {
+        "id": "6b9a9290.f4c99c",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2252.5714721679688,
+        "y": 676.4286041259766,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "3db94b2d.c6d2b4"
+            ]
+        ]
+    },
+    {
+        "id": "3db94b2d.c6d2b4",
+        "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 self-service-generate-name-changeassign\" />\n",
+        "comments": "",
+        "x": 2440.5714721679688,
+        "y": 638.4286041259766,
+        "z": "2d052f87.5609f",
+        "wires": []
+    },
+    {
+        "id": "2de6b8a9.5ab508",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 519.7143096923828,
+        "y": 530.857120513916,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "b4ae1ea.8e047e",
+                "2396d4ed.eaa96c",
+                "85402c0f.e3301"
+            ]
+        ]
+    },
+    {
+        "id": "b4ae1ea.8e047e",
+        "type": "set",
+        "name": "set ss.input.param.found.in.service.param to false",
+        "xml": "<set>\n   <parameter name='ss.input.param.found.in.service.param' value='false' />",
+        "comments": "",
+        "x": 882.1428833007812,
+        "y": 492.28572845458984,
+        "z": "2d052f87.5609f",
+        "wires": []
+    },
+    {
+        "id": "894750cd.34691",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n",
+        "comments": "",
+        "x": 1807.0000457763672,
+        "y": 710.0000133514404,
+        "z": "2d052f87.5609f",
+        "wires": []
+    },
+    {
+        "id": "85402c0f.e3301",
+        "type": "switchNode",
+        "name": "switch ss.input.param.found.in.service.param",
+        "xml": "<switch test='`$ss.input.param.found.in.service.param`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 862.7143249511719,
+        "y": 859.4285907745361,
+        "z": "2d052f87.5609f",
+        "wires": [
+            [
+                "f4c49db0.aa1a"
+            ]
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json
index a29a7160..80c55d8e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.json
@@ -1,381 +1,381 @@
-[
-    {
-        "id": "dc9ceada.747c9",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 79,
-        "y": 59,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "6bbe4a7.598cb34"
-            ]
-        ]
-    },
-    {
-        "id": "6bbe4a7.598cb34",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "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": 355,
-        "y": 60,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "bb95c798.3cf368"
-            ]
-        ]
-    },
-    {
-        "id": "bb95c798.3cf368",
-        "type": "method",
-        "name": "self-serve-vnf-changeassign ",
-        "xml": "<method rpc='self-serve-vnf-changeassign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 672,
-        "y": 60,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "72afded.b78132"
-            ]
-        ]
-    },
-    {
-        "id": "72afded.b78132",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 97.5,
-        "y": 142,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "7eab9742.528a9",
-                "c971c45d.67ed58"
-            ]
-        ]
-    },
-    {
-        "id": "7e2d788f.d439a8",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n   <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>\n   <parameter name='ss.input.param.index' value='`$i`' />\n   <parameter name='ss.service-data.param.index' value='`$j`' />\n   <parameter name='ss.input.param.found.in.service.param' value='true' />\n   <parameter name='ss.capability-type' value='vnf' />\n   <parameter name='ss.capability-action' value='changeassign' />",
-        "comments": "",
-        "x": 1907,
-        "y": 446,
-        "z": "ea55fe64.6b3f48",
-        "wires": []
-    },
-    {
-        "id": "7eab9742.528a9",
-        "type": "switchNode",
-        "name": "switch vnf-input-parameters",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 340,
-        "y": 185,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "b93197e8.d9d048"
-            ]
-        ]
-    },
-    {
-        "id": "b93197e8.d9d048",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 570.1428833007812,
-        "y": 184.85714721679688,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "589a47b7.bf05e"
-            ]
-        ]
-    },
-    {
-        "id": "589a47b7.bf05e",
-        "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 param name/value provided in vnf-request-input\" />\n",
-        "comments": "",
-        "x": 743,
-        "y": 185,
-        "z": "ea55fe64.6b3f48",
-        "wires": []
-    },
-    {
-        "id": "c971c45d.67ed58",
-        "type": "for",
-        "name": "for vnf-input-parameters.param index i",
-        "xml": "<for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 367,
-        "y": 309,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "a56c6c88.4c89e8"
-            ]
-        ]
-    },
-    {
-        "id": "a56c6c88.4c89e8",
-        "type": "switchNode",
-        "name": "switch service param length null",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 670,
-        "y": 310,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "34cc20c5.be038"
-            ]
-        ]
-    },
-    {
-        "id": "80ac5f3.6ad6ca",
-        "type": "for",
-        "name": "for service-data.vnf-parameters-data.param index j",
-        "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1038,
-        "y": 447,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "9335b73a.1c0978"
-            ]
-        ]
-    },
-    {
-        "id": "9335b73a.1c0978",
-        "type": "switchNode",
-        "name": "switch match for vnf-name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1369,
-        "y": 447,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "94ee529d.b53828"
-            ]
-        ]
-    },
-    {
-        "id": "94ee529d.b53828",
-        "type": "not-found",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1559,
-        "y": 447,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "97f03230.8c76b8"
-            ]
-        ]
-    },
-    {
-        "id": "ad40df27.b42668",
-        "type": "not-found",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1153,
-        "y": 531,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "c7b41da6.be73e"
-            ]
-        ]
-    },
-    {
-        "id": "c7b41da6.be73e",
-        "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 param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`\" />\n",
-        "comments": "",
-        "x": 1349,
-        "y": 531,
-        "z": "ea55fe64.6b3f48",
-        "wires": []
-    },
-    {
-        "id": "97f03230.8c76b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1714,
-        "y": 445,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "7e2d788f.d439a8",
-                "ada6d713.8fde8",
-                "8f887c51.38a1b"
-            ]
-        ]
-    },
-    {
-        "id": "ada6d713.8fde8",
-        "type": "call",
-        "name": "call self-serve-generate-name-changeassign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2018,
-        "y": 515,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "e152b55.54f7b48",
-                "e8deb550.a2fdb"
-            ]
-        ]
-    },
-    {
-        "id": "e152b55.54f7b48",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2268,
-        "y": 487,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "b0b66b18.a254d8"
-            ]
-        ]
-    },
-    {
-        "id": "e8deb550.a2fdb",
-        "type": "failure",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2278,
-        "y": 555,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "b0b66b18.a254d8"
-            ]
-        ]
-    },
-    {
-        "id": "b0b66b18.a254d8",
-        "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 self-service-generate-name-changeassign\" />\n",
-        "comments": "",
-        "x": 2462,
-        "y": 516,
-        "z": "ea55fe64.6b3f48",
-        "wires": []
-    },
-    {
-        "id": "34cc20c5.be038",
-        "type": "other",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 885,
-        "y": 310,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "8ae41419.5f27e8"
-            ]
-        ]
-    },
-    {
-        "id": "a74b1481.6af278",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n   <parameter name='ss.input.param.found.in.service.param' value='false' />",
-        "comments": "",
-        "x": 895,
-        "y": 388,
-        "z": "ea55fe64.6b3f48",
-        "wires": []
-    },
-    {
-        "id": "d662c9f0.cf7fb",
-        "type": "switchNode",
-        "name": "switch if found vnf_name",
-        "xml": "<switch test='`$ss.input.param.found.in.service.param`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 952,
-        "y": 531,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "ad40df27.b42668"
-            ]
-        ]
-    },
-    {
-        "id": "8f887c51.38a1b",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n",
-        "comments": "",
-        "x": 1930,
-        "y": 588,
-        "z": "ea55fe64.6b3f48",
-        "wires": []
-    },
-    {
-        "id": "8ae41419.5f27e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 711,
-        "y": 388,
-        "z": "ea55fe64.6b3f48",
-        "wires": [
-            [
-                "a74b1481.6af278",
-                "80ac5f3.6ad6ca",
-                "d662c9f0.cf7fb"
-            ]
-        ]
-    }
+[
+    {
+        "id": "d7b04ee5.646b",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 151.42852783203125,
+        "y": 47.142860412597656,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "d90f8810.ec0b98"
+            ]
+        ]
+    },
+    {
+        "id": "d90f8810.ec0b98",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 427.42852783203125,
+        "y": 48.142860412597656,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "ceeb919a.85f53"
+            ]
+        ]
+    },
+    {
+        "id": "ceeb919a.85f53",
+        "type": "method",
+        "name": "self-serve-vnf-changeassign ",
+        "xml": "<method rpc='self-serve-vnf-changeassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 270.14283752441406,
+        "y": 106.71429443359375,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "94a807c3.18e1f8"
+            ]
+        ]
+    },
+    {
+        "id": "94a807c3.18e1f8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 295.64286041259766,
+        "y": 171.5714225769043,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "686eb002.8272c",
+                "e14e8d9d.455fb"
+            ]
+        ]
+    },
+    {
+        "id": "fcf2582e.807218",
+        "type": "set",
+        "name": "set",
+        "xml": "<set>\n   <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>\n   <parameter name='ss.input.param.index' value='`$i`' />\n   <parameter name='ss.service-data.param.index' value='`$j`' />\n   <parameter name='ss.input.param.found.in.service.param' value='true' />\n   <parameter name='ss.capability-type' value='vnf' />\n   <parameter name='ss.capability-action' value='changeassign' />",
+        "comments": "",
+        "x": 1965.142677307129,
+        "y": 584.1428298950195,
+        "z": "d97c316.162bed",
+        "wires": []
+    },
+    {
+        "id": "686eb002.8272c",
+        "type": "switchNode",
+        "name": "switch vnf-input-parameters",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 575.2857055664062,
+        "y": 224.5714340209961,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "cb121cc3.86892"
+            ]
+        ]
+    },
+    {
+        "id": "cb121cc3.86892",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 805.4285888671875,
+        "y": 224.42858123779297,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "8065a7c1.8e9ab8"
+            ]
+        ]
+    },
+    {
+        "id": "8065a7c1.8e9ab8",
+        "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 param name/value provided in vnf-request-input\" />\n",
+        "comments": "",
+        "x": 978.2857055664062,
+        "y": 224.5714340209961,
+        "z": "d97c316.162bed",
+        "wires": []
+    },
+    {
+        "id": "e14e8d9d.455fb",
+        "type": "for",
+        "name": "for vnf-input-parameters.param index i",
+        "xml": "<for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 602.2857055664062,
+        "y": 348.5714340209961,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "533d1a61.0ffb54"
+            ]
+        ]
+    },
+    {
+        "id": "533d1a61.0ffb54",
+        "type": "switchNode",
+        "name": "switch service param length null",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 949.5713806152344,
+        "y": 348.14287757873535,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "6fd8cd13.aa94d4"
+            ]
+        ]
+    },
+    {
+        "id": "deca9f28.6ee9c",
+        "type": "for",
+        "name": "for service-data.vnf-parameters-data.param index j",
+        "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1040.4284057617188,
+        "y": 586.5713920593262,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "fda41515.3cb6c8"
+            ]
+        ]
+    },
+    {
+        "id": "fda41515.3cb6c8",
+        "type": "switchNode",
+        "name": "switch match for vnf-name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1427.142677307129,
+        "y": 585.1428298950195,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "1021041f.bc041c"
+            ]
+        ]
+    },
+    {
+        "id": "1021041f.bc041c",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1617.142677307129,
+        "y": 585.1428298950195,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "987e92d3.7d94f"
+            ]
+        ]
+    },
+    {
+        "id": "75e8b33d.ad968c",
+        "type": "not-found",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1291.142677307129,
+        "y": 830.5714149475098,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "d1376de5.42ab3"
+            ]
+        ]
+    },
+    {
+        "id": "d1376de5.42ab3",
+        "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 vnf-request-input.vnf-input-parameters.param[].name found in service-data.\" />\n",
+        "comments": "",
+        "x": 1464.285530090332,
+        "y": 829.1428279876709,
+        "z": "d97c316.162bed",
+        "wires": []
+    },
+    {
+        "id": "987e92d3.7d94f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1772.142677307129,
+        "y": 583.1428298950195,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "fcf2582e.807218",
+                "8426aa6a.8cf0a8",
+                "543dede3.b39004"
+            ]
+        ]
+    },
+    {
+        "id": "8426aa6a.8cf0a8",
+        "type": "call",
+        "name": "call self-serve-generate-name-changeassign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2108.999755859375,
+        "y": 653.1428198814392,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "32fc0971.1c0146",
+                "21d46561.3c7f6a"
+            ]
+        ]
+    },
+    {
+        "id": "32fc0971.1c0146",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2398.9996490478516,
+        "y": 616.5713996887207,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "2151c897.b7d8f8"
+            ]
+        ]
+    },
+    {
+        "id": "21d46561.3c7f6a",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2408.9996490478516,
+        "y": 684.5713996887207,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "2151c897.b7d8f8"
+            ]
+        ]
+    },
+    {
+        "id": "2151c897.b7d8f8",
+        "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 self-service-generate-name-changeassign\" />\n",
+        "comments": "",
+        "x": 2592.9996490478516,
+        "y": 645.5713996887207,
+        "z": "d97c316.162bed",
+        "wires": []
+    },
+    {
+        "id": "6fd8cd13.aa94d4",
+        "type": "other",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1164.5713806152344,
+        "y": 348.14287757873535,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "988b476b.b275c8"
+            ]
+        ]
+    },
+    {
+        "id": "3d53f85d.e87578",
+        "type": "set",
+        "name": "set ss.input.param.found.in.service.param = false",
+        "xml": "<set>\n   <parameter name='ss.input.param.found.in.service.param' value='false' />",
+        "comments": "",
+        "x": 1031.7141418457031,
+        "y": 520.4285628795624,
+        "z": "d97c316.162bed",
+        "wires": []
+    },
+    {
+        "id": "84dc5d99.83e5",
+        "type": "switchNode",
+        "name": "switch ss.input.param.found.in.service.param",
+        "xml": "<switch test='`$ss.input.param.found.in.service.param`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1010.1427307128906,
+        "y": 829.1428279876709,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "75e8b33d.ad968c"
+            ]
+        ]
+    },
+    {
+        "id": "543dede3.b39004",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n",
+        "comments": "",
+        "x": 1992.4283828735352,
+        "y": 726.1428184509277,
+        "z": "d97c316.162bed",
+        "wires": []
+    },
+    {
+        "id": "988b476b.b275c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 641.9999389648438,
+        "y": 584.7142848968506,
+        "z": "d97c316.162bed",
+        "wires": [
+            [
+                "3d53f85d.e87578",
+                "deca9f28.6ee9c",
+                "84dc5d99.83e5"
+            ]
+        ]
+    }
 ]
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.json
new file mode 100644
index 00000000..b41c0f9f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.json
@@ -0,0 +1,386 @@
+[
+    {
+        "id": "9937778e.f87d58",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 175.71429443359375,
+        "y": 62.85714340209961,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "4892fa18.531f64"
+            ]
+        ]
+    },
+    {
+        "id": "4892fa18.531f64",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 451.71429443359375,
+        "y": 63.85714340209961,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "35d27316.1b81fc"
+            ]
+        ]
+    },
+    {
+        "id": "35d27316.1b81fc",
+        "type": "method",
+        "name": "self-serve-vnf-generate-name-changeassign",
+        "xml": "<method rpc='self-serve-vnf-generate-name-changeassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 356.28570556640625,
+        "y": 115.71428680419922,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "685554a6.20595c"
+            ]
+        ]
+    },
+    {
+        "id": "37b606aa.d2592a",
+        "type": "execute",
+        "name": "execute NameGenerationNode-changeassign",
+        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"vnf.changeassign.nameGenResponse\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 759.9999389648438,
+        "y": 584.2856769561768,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "7c08819e.60f86",
+                "88e7bf8c.88a75"
+            ]
+        ]
+    },
+    {
+        "id": "7c08819e.60f86",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1039.571388244629,
+        "y": 532.1428203582764,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "b64a72c8.635e1"
+            ]
+        ]
+    },
+    {
+        "id": "88e7bf8c.88a75",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1044.571388244629,
+        "y": 630.1428203582764,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "b64a72c8.635e1"
+            ]
+        ]
+    },
+    {
+        "id": "b64a72c8.635e1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1230.8571014404297,
+        "y": 572.7142314910889,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "6ffcdc87.53bfe4",
+                "705ae050.4e8b2"
+            ]
+        ]
+    },
+    {
+        "id": "6ffcdc87.53bfe4",
+        "type": "set",
+        "name": "set status as FAILED",
+        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1453.2856369018555,
+        "y": 519.2856426239014,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "705ae050.4e8b2",
+        "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 NameGenerationNode ChangeAssign vnf ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 1439.2856369018555,
+        "y": 628.2856426239014,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "685554a6.20595c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 348.9999771118164,
+        "y": 493.5714178085327,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "518b70ab.3a899",
+                "4a63a9c6.d7c168",
+                "37b606aa.d2592a",
+                "f16a6afe.5463e8",
+                "1ecdeb4b.5e0395",
+                "53c8ae4e.799bb",
+                "7e97819c.97305"
+            ]
+        ]
+    },
+    {
+        "id": "518b70ab.3a899",
+        "type": "for",
+        "name": "for service-data.vnf-parameters-data.param index i",
+        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 791.2857246398926,
+        "y": 339.4285259246826,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "a63b3e76.ee0f7"
+            ]
+        ]
+    },
+    {
+        "id": "a63b3e76.ee0f7",
+        "type": "switchNode",
+        "name": "switch resource-key[].name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1162.428560256958,
+        "y": 339.57139015197754,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "d5c6eaf9.2a5d88"
+            ]
+        ]
+    },
+    {
+        "id": "d5c6eaf9.2a5d88",
+        "type": "outcome",
+        "name": "external-key",
+        "xml": "<outcome value='external-key'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1400.428560256958,
+        "y": 339.57139015197754,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "486ff831.7e3c08"
+            ]
+        ]
+    },
+    {
+        "id": "486ff831.7e3c08",
+        "type": "set",
+        "name": "set tmp.external-key.value",
+        "xml": "<set>\n<parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />\n",
+        "comments": "",
+        "x": 1632.428560256958,
+        "y": 339.57139015197754,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "4a63a9c6.d7c168",
+        "type": "switchNode",
+        "name": "switch tmp.external-key.value",
+        "xml": "<switch test='`$tmp.external-key.value`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 714.1428756713867,
+        "y": 414.1427888870239,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "a90891b7.fff2b"
+            ]
+        ]
+    },
+    {
+        "id": "a90891b7.fff2b",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 930.0000076293945,
+        "y": 414.5713424682617,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "370ccd0f.c72bf2"
+            ]
+        ]
+    },
+    {
+        "id": "370ccd0f.c72bf2",
+        "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=\"self-service-vnf-generate-name-changeassign error : external-key is null for vnf\" />\n",
+        "comments": "",
+        "x": 1091.0000076293945,
+        "y": 414.5713424682617,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "16a4f29b.4a90ad",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 856.2855949401855,
+        "y": 727.0316724777222,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "fbc4873f.c1f5c8"
+            ]
+        ]
+    },
+    {
+        "id": "fbc4873f.c1f5c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1064.6985092163086,
+        "y": 780.1586875915527,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "d296203b.a4db",
+                "adedc513.a0a9e8"
+            ]
+        ]
+    },
+    {
+        "id": "d296203b.a4db",
+        "type": "set",
+        "name": "set status as FAILED",
+        "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1289.8570594787598,
+        "y": 728.5713958740234,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "adedc513.a0a9e8",
+        "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=\"`'Failed to update generic-vnf.vnf-name to ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`\" />\n",
+        "comments": "",
+        "x": 1262.1428451538086,
+        "y": 823.7142448425293,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "1ecdeb4b.5e0395",
+        "type": "set",
+        "name": "set param[].value and status",
+        "xml": "<set>\n\t <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].value`' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`'/>\n\t <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />",
+        "comments": "",
+        "x": 681.9683074951172,
+        "y": 927.4602336883545,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "f16a6afe.5463e8",
+        "type": "save",
+        "name": "update generic-vnf",
+        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n\tresource=\"generic-vnf\"\n\t\tkey=\"generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id \" >\n<parameter name=\"vnf-name\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 661.7936096191406,
+        "y": 775.5079565048218,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "16a4f29b.4a90ad",
+                "70a5ecf7.6d4b54"
+            ]
+        ]
+    },
+    {
+        "id": "70a5ecf7.6d4b54",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 861.1588363647461,
+        "y": 824.3967752456665,
+        "z": "23014bb9.2ef1e4",
+        "wires": [
+            [
+                "fbc4873f.c1f5c8"
+            ]
+        ]
+    },
+    {
+        "id": "53c8ae4e.799bb",
+        "type": "set",
+        "name": "set tmp.external-key.value = NULL",
+        "xml": "<set>\n<parameter name='tmp.external-key.value' value='' />\n",
+        "comments": "",
+        "x": 725.7143173217773,
+        "y": 281.42848014831543,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    },
+    {
+        "id": "7e97819c.97305",
+        "type": "set",
+        "name": "set tmp.vnf.changeassign.naming-data-payload",
+        "xml": "<set>\n<parameter name=\"tmp.vnf.changeassign.naming-data-payload\" \n\tvalue=\"`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`\"/>",
+        "comments": "",
+        "x": 775.8571166992188,
+        "y": 491.14282608032227,
+        "z": "23014bb9.2ef1e4",
+        "wires": []
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.json
new file mode 100644
index 00000000..ccb80da9
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.json
@@ -0,0 +1,1001 @@
+[
+    {
+        "id": "af3e34db.feb098",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 126.25,
+        "y": 45,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "ca83e5f.ab90a18"
+            ]
+        ]
+    },
+    {
+        "id": "ca83e5f.ab90a18",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 378.8213806152344,
+        "y": 44.428558349609375,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "6274efd5.b2315"
+            ]
+        ]
+    },
+    {
+        "id": "6274efd5.b2315",
+        "type": "method",
+        "name": "self-serve-vnf-generate-name",
+        "xml": "<method rpc='self-serve-vnf-generate-name' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 249.05955505371094,
+        "y": 106.333327293396,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "a81678e9.2da388"
+            ]
+        ]
+    },
+    {
+        "id": "2ec3454f.2d328a",
+        "type": "switchNode",
+        "name": "switch capability action",
+        "xml": "<switch test=\"`$ss.capability-action`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 316.7142028808594,
+        "y": 880.9762096405029,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "47b5b6d4.177928",
+                "29572028.8c0e7"
+            ]
+        ]
+    },
+    {
+        "id": "47b5b6d4.177928",
+        "type": "not-found",
+        "name": "unassign",
+        "xml": "<outcome value='unassign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 542.0119094848633,
+        "y": 260.7380905151367,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "97f6ac39.db8e9"
+            ]
+        ]
+    },
+    {
+        "id": "a81678e9.2da388",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 230.18649291992188,
+        "y": 172.206392288208,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "2ec3454f.2d328a",
+                "19085dd6.206392"
+            ]
+        ]
+    },
+    {
+        "id": "97f6ac39.db8e9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 712.5000076293945,
+        "y": 261.25000190734863,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "ae293e85.fab67",
+                "4d44790c.037178"
+            ]
+        ]
+    },
+    {
+        "id": "ae293e85.fab67",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
+        "comments": "",
+        "x": 963.7500076293945,
+        "y": 262.50000063702464,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "29572028.8c0e7",
+        "type": "not-found",
+        "name": "assign",
+        "xml": "<outcome value='assign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 514.603157043457,
+        "y": 1514.535545349121,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "c78ccdba.af20a"
+            ]
+        ]
+    },
+    {
+        "id": "7a858a5e.cd7834",
+        "type": "set",
+        "name": "set tmp.naming-data-payload",
+        "xml": "<set>\n\t<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n\t<parameter name='tmp.gen-name_length' value='0' />",
+        "comments": "",
+        "x": 964.3650646209717,
+        "y": 1514.8730697631836,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "316f0a4f.16ee26",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1120.0000228881836,
+        "y": 754.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4d44790c.037178",
+        "type": "for",
+        "name": "for vnf-parameters-data",
+        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 943.7857971191406,
+        "y": 326.25001525878906,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "c4c0d2ab.b2585"
+            ]
+        ]
+    },
+    {
+        "id": "c4c0d2ab.b2585",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186.6428527832031,
+        "y": 326.25001525878906,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "e657dc1b.40e9b"
+            ]
+        ]
+    },
+    {
+        "id": "e657dc1b.40e9b",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1367.3572082519531,
+        "y": 326.25,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "31a5002f.e6918"
+            ]
+        ]
+    },
+    {
+        "id": "4504c048.2c22f",
+        "type": "for",
+        "name": "for vnf-parameters-data",
+        "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1089.5000228881836,
+        "y": 555.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "57bc2b62.0fd734"
+            ]
+        ]
+    },
+    {
+        "id": "21846577.931eda",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[0].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[0].element_length`\" value='`$j + 1`' />",
+        "comments": "",
+        "x": 1692.0000228881836,
+        "y": 553.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "f773ea3a.971e88",
+        "type": "set",
+        "name": "set set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
+        "comments": "",
+        "x": 1087.0001754760742,
+        "y": 481.8213634490967,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "e286d1e2.22f7f",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+        "comments": "",
+        "x": 1087.0000228881836,
+        "y": 617.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "2f0e6f87.4aa69",
+        "type": "set",
+        "name": "set close payload list",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
+        "comments": "",
+        "x": 1093.0000228881836,
+        "y": 682.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "6a04c3c2.d8353c",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1123.0000228881836,
+        "y": 808.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "91a5a0b9.28b1d",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1482.7500305175781,
+        "y": 884.7142467498779,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "c44601cf.e3781"
+            ]
+        ]
+    },
+    {
+        "id": "2391c5d1.fd861a",
+        "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 NameGenerationNode Unassign\" />\n",
+        "comments": "",
+        "x": 1847.7500305175781,
+        "y": 984.7142467498779,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "ffa6ef8.c99991",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1487.7500305175781,
+        "y": 983.7142467498779,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "c44601cf.e3781"
+            ]
+        ]
+    },
+    {
+        "id": "c44601cf.e3781",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1645.7500305175781,
+        "y": 928.7142467498779,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "122596ab.6c3209",
+                "2391c5d1.fd861a"
+            ]
+        ]
+    },
+    {
+        "id": "122596ab.6c3209",
+        "type": "set",
+        "name": "set status as FAILED",
+        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1861.7500305175781,
+        "y": 875.7142467498779,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "acdd082c.0a4988",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1096.500015258789,
+        "y": 1083.9643726348877,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "31a5002f.e6918",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 816.2500114440918,
+        "y": 483.21427154541016,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "f773ea3a.971e88",
+                "4504c048.2c22f",
+                "e286d1e2.22f7f",
+                "2f0e6f87.4aa69",
+                "316f0a4f.16ee26",
+                "acdd082c.0a4988",
+                "6a04c3c2.d8353c",
+                "7281ab1.108d054",
+                "7190fc5.2e53204",
+                "b700fe4f.6ea67",
+                "82081d21.8af89",
+                "4b9fd950.22bda8"
+            ]
+        ]
+    },
+    {
+        "id": "57bc2b62.0fd734",
+        "type": "switchNode",
+        "name": "switch external-key",
+        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1328.0000228881836,
+        "y": 554.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "e7102f7d.d31b6"
+            ]
+        ]
+    },
+    {
+        "id": "e7102f7d.d31b6",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1512.0000228881836,
+        "y": 554.9642696380615,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "21846577.931eda"
+            ]
+        ]
+    },
+    {
+        "id": "7281ab1.108d054",
+        "type": "execute",
+        "name": "execute RestApiCallNode - DELETE gen-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1168.8928527832031,
+        "y": 931.5714855194092,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "91a5a0b9.28b1d",
+                "ffa6ef8.c99991"
+            ]
+        ]
+    },
+    {
+        "id": "7190fc5.2e53204",
+        "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 namegeneration.node.UnAssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1041.25,
+        "y": 865,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b700fe4f.6ea67",
+        "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 namegeneration.node.UnAssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1037.916763305664,
+        "y": 1015.0000152587891,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "de5ed672.9504b8",
+        "type": "switchNode",
+        "name": "switch resource-name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1333.7500228881836,
+        "y": 1203.7500171661377,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "6f5ecb0e.d83724"
+            ]
+        ]
+    },
+    {
+        "id": "6f5ecb0e.d83724",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1525.7500228881836,
+        "y": 1202.7500171661377,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "1a582734.1c4b39"
+            ]
+        ]
+    },
+    {
+        "id": "1a582734.1c4b39",
+        "type": "set",
+        "name": "set set payload data",
+        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n",
+        "comments": "",
+        "x": 1712.2500228881836,
+        "y": 1202.7500171661377,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "4b9fd950.22bda8",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1085.750015258789,
+        "y": 1202.7500095367432,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "de5ed672.9504b8"
+            ]
+        ]
+    },
+    {
+        "id": "82081d21.8af89",
+        "type": "set",
+        "name": "set status as DELETED",
+        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />",
+        "comments": "",
+        "x": 1085.7499923706055,
+        "y": 1147.9999923706055,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "46d41de0.7a0cc4",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1173.166519165039,
+        "y": 1980.0000286102295,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "200ba840.7f1278",
+        "type": "for",
+        "name": "for vnf-parameters-data",
+        "xml": "<for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1770.6665344238281,
+        "y": 1590.2500267028809,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "1a217f86.3ebd2"
+            ]
+        ]
+    },
+    {
+        "id": "1a217f86.3ebd2",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name=\"tmp.naming-data-payload\" value=\"`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].name`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element[$j].value`\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`\"/>\n<parameter name=\"`tmp.gen-name[$tmp.gen-name_length].element_length`\" value='`$j + 1`' />",
+        "comments": "",
+        "x": 2023.1665344238281,
+        "y": 1590.2500267028809,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "c73e069c.8a2e28",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n",
+        "comments": "",
+        "x": 1751.5950012207031,
+        "y": 1528.964443206787,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "10b3ff3c.77cba1",
+        "type": "set",
+        "name": "set payload data",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
+        "comments": "",
+        "x": 1753.1665344238281,
+        "y": 1646.2500267028809,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "f44eb178.31eaa",
+        "type": "set",
+        "name": "set close payload list",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
+        "comments": "",
+        "x": 1148.166519165039,
+        "y": 1936.9999675750732,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "2368778a.9a1ae8",
+        "type": "execute",
+        "name": "execute replace extra comma",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',]' />\n   <parameter name='replacement' value=']' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1174.166519165039,
+        "y": 2031.0000286102295,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "25410bf3.d5fd84",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1516.416648864746,
+        "y": 2150.000274658203,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "d82a7d30.19ff5"
+            ]
+        ]
+    },
+    {
+        "id": "338c365d.e7c04a",
+        "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 NameGenerationNode Assign\" />\n",
+        "comments": "",
+        "x": 1881.4166412353516,
+        "y": 2247.5002765655518,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "5ff247d0.61e018",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1521.4166412353516,
+        "y": 2246.5002765655518,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "d82a7d30.19ff5"
+            ]
+        ]
+    },
+    {
+        "id": "d82a7d30.19ff5",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1679.4166412353516,
+        "y": 2191.5002765655518,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "e3f624d0.095ed8",
+                "338c365d.e7c04a"
+            ]
+        ]
+    },
+    {
+        "id": "e3f624d0.095ed8",
+        "type": "set",
+        "name": "set status as FAILED",
+        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />",
+        "comments": "",
+        "x": 1895.4166412353516,
+        "y": 2138.5002765655518,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "9337d2c9.9435b",
+        "type": "execute",
+        "name": "execute jsonStringToCtx",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.httpResponse\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1160.166519165039,
+        "y": 2380.000036239624,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "49ed3077.f85e7",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1532.0595932006836,
+        "y": 1591.0356693267822,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "c73e069c.8a2e28",
+                "200ba840.7f1278",
+                "10b3ff3c.77cba1"
+            ]
+        ]
+    },
+    {
+        "id": "f4b8a1b1.39296",
+        "type": "for",
+        "name": "for vnf-parameters-data",
+        "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 945.9644927978516,
+        "y": 1591.2503910064697,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "bc8d77f9.febd58"
+            ]
+        ]
+    },
+    {
+        "id": "bc8d77f9.febd58",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1187.571548461914,
+        "y": 1591.2503910064697,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "aa52a53d.d90d78"
+            ]
+        ]
+    },
+    {
+        "id": "aa52a53d.d90d78",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1368.285903930664,
+        "y": 1591.2503910064697,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "49ed3077.f85e7"
+            ]
+        ]
+    },
+    {
+        "id": "c78ccdba.af20a",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 686.2500076293945,
+        "y": 1514.155053138733,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "f4b8a1b1.39296",
+                "f39b937c.aa4b9",
+                "7a858a5e.cd7834"
+            ]
+        ]
+    },
+    {
+        "id": "f39b937c.aa4b9",
+        "type": "switchNode",
+        "name": "switch tmp.naming-data-payload is null",
+        "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 995.7500152587891,
+        "y": 1714.1550579071045,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "62b243b0.214edc"
+            ]
+        ]
+    },
+    {
+        "id": "62b243b0.214edc",
+        "type": "not-found",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1232.750015258789,
+        "y": 1715.1550579071045,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "5e87a197.3645b"
+            ]
+        ]
+    },
+    {
+        "id": "5e87a197.3645b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 909.5000152587891,
+        "y": 1936.9050579071045,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "f44eb178.31eaa",
+                "46d41de0.7a0cc4",
+                "2368778a.9a1ae8",
+                "9337d2c9.9435b",
+                "570d2cbf.e15644",
+                "3bb91c6d.095be4",
+                "af9341c5.9475e",
+                "55954cc9.700ec4"
+            ]
+        ]
+    },
+    {
+        "id": "570d2cbf.e15644",
+        "type": "execute",
+        "name": "execute RestApiCallNode - POST gen-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >    \n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\n    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\n    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"nameGenResponse\" />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1220.8929595947266,
+        "y": 2191.8337726593018,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "25410bf3.d5fd84",
+                "5ff247d0.61e018"
+            ]
+        ]
+    },
+    {
+        "id": "3bb91c6d.095be4",
+        "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 namegeneration.node.AssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1096.25,
+        "y": 2101.25,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "af9341c5.9475e",
+        "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 namegeneration.node.AssignNameNode\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1097.9166412353516,
+        "y": 2306.2500343322754,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2879ca51.fb1d86",
+        "type": "for",
+        "name": "for vnf-parameters-data",
+        "xml": "<for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1401.9403228759766,
+        "y": 2460.083044052124,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "b4bf8116.4b95f"
+            ]
+        ]
+    },
+    {
+        "id": "55954cc9.700ec4",
+        "type": "for",
+        "name": "for response elements",
+        "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1154.9403228759766,
+        "y": 2459.083044052124,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "2879ca51.fb1d86"
+            ]
+        ]
+    },
+    {
+        "id": "b4bf8116.4b95f",
+        "type": "switchNode",
+        "name": "switch resource-name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1649.0355758666992,
+        "y": 2459.845019161701,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "314e7b92.2eb284"
+            ]
+        ]
+    },
+    {
+        "id": "b64275d.5c7fb88",
+        "type": "set",
+        "name": "set param value and status",
+        "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value=\"`$jsonContextPrefix.elements[$n].resource-value`\" />\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />",
+        "comments": "",
+        "x": 2036.5594940185547,
+        "y": 2458.5723484158516,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    },
+    {
+        "id": "314e7b92.2eb284",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1833.3211784362793,
+        "y": 2459.416481792927,
+        "z": "d9ed52e6.dc44c",
+        "wires": [
+            [
+                "b64275d.5c7fb88"
+            ]
+        ]
+    },
+    {
+        "id": "19085dd6.206392",
+        "type": "set",
+        "name": "set pathname for context logging",
+        "xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-gen-name-' + \n\t$ss.capability-type + '-' + $ss.capability-action + '-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\" />\n",
+        "comments": "",
+        "x": 537.5000152587891,
+        "y": 172.50000286102295,
+        "z": "d9ed52e6.dc44c",
+        "wires": []
+    }
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json
index a5fe752b..6b5b8782 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json
@@ -1,57 +1,57 @@
 [
     {
-        "id": "76165194.b6c96",
+        "id": "c5b593f.de0997",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 165.71429443359375,
-        "y": 75.71428680419922,
-        "z": "303dc9e1.28f7b6",
+        "x": 161.42857360839844,
+        "y": 48.57143020629883,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "236f2975.7a6d96"
+                "61eab8c6.809638"
             ]
         ]
     },
     {
-        "id": "5e292d5b.0c61b4",
+        "id": "476ba12e.72d0b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 209.44049835205078,
-        "y": 194.4920768737793,
-        "z": "303dc9e1.28f7b6",
+        "x": 205.15477752685547,
+        "y": 167.3492202758789,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "8e6fd286.da7e4",
-                "9cf90cf3.4244d",
-                "c41a4b38.3c8b38",
-                "f9a09d54.7ab46",
-                "59a68f10.20a5"
+                "52ececda.9e0f84",
+                "716b81a4.0f5df",
+                "138a6bf3.2831e4",
+                "434ab0d7.7891",
+                "af88c68d.542008"
             ]
         ]
     },
     {
-        "id": "c3f3aa48.2e3088",
+        "id": "f111d369.224dc",
         "type": "method",
         "name": "method self-serve-vnf-unassign",
         "xml": "<method rpc='self-serve-vnf-unassign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 282.47620391845703,
-        "y": 130.4206418991089,
-        "z": "303dc9e1.28f7b6",
+        "x": 278.1904830932617,
+        "y": 103.2777853012085,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "5e292d5b.0c61b4"
+                "476ba12e.72d0b"
             ]
         ]
     },
     {
-        "id": "236f2975.7a6d96",
+        "id": "61eab8c6.809638",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -59,511 +59,511 @@
         "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": 440.9524917602539,
-        "y": 75.9047794342041,
-        "z": "303dc9e1.28f7b6",
+        "x": 436.6667709350586,
+        "y": 48.76192283630371,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "c3f3aa48.2e3088"
+                "f111d369.224dc"
             ]
         ]
     },
     {
-        "id": "aed7b0d8.edb31",
+        "id": "9b53fa35.2106f8",
         "type": "for",
         "name": "foreach vnf-parameters-data.param[]",
         "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 792.4646072387695,
-        "y": 473.2738456726074,
-        "z": "303dc9e1.28f7b6",
+        "x": 788.1788864135742,
+        "y": 446.13098907470703,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "4c583cb3.a2e9b4",
-                "d15480d3.12273"
+                "13b713a3.91f76c",
+                "eb9f0d00.5c804"
             ]
         ]
     },
     {
-        "id": "13c9ccf0.5ce9c3",
+        "id": "73638f7e.a5e31",
         "type": "switchNode",
         "name": "switch resource-resolution-data.status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1091.5598983764648,
-        "y": 695.5477423667908,
-        "z": "303dc9e1.28f7b6",
+        "x": 1087.2741775512695,
+        "y": 668.4048857688904,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "e71d8f06.04b4e",
-                "f1d7b373.953da"
+                "15033255.82a12e",
+                "beee7743.7ea5e8"
             ]
         ]
     },
     {
-        "id": "e71d8f06.04b4e",
+        "id": "15033255.82a12e",
         "type": "other",
         "name": "SUCCESS",
         "xml": "<outcome value='SUCCESS'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1366.9528999328613,
-        "y": 696.2619976997375,
-        "z": "303dc9e1.28f7b6",
+        "x": 1362.667179107666,
+        "y": 669.1191411018372,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "17e4f190.77d57e"
+                "2bd33584.bf077a"
             ]
         ]
     },
     {
-        "id": "8e6fd286.da7e4",
+        "id": "52ececda.9e0f84",
         "type": "for",
         "name": "foreach capability-order[]",
         "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 458.0358428955078,
-        "y": 328.4642505645752,
-        "z": "303dc9e1.28f7b6",
+        "x": 453.7501220703125,
+        "y": 301.3213939666748,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "53aeb795.8d7128",
-                "fc9f38f4.0c2118",
-                "aed7b0d8.edb31",
-                "88725cd7.d671f"
+                "975deb30.c1c768",
+                "62184d5d.c851c4",
+                "9b53fa35.2106f8",
+                "1c990616.a2478a"
             ]
         ]
     },
     {
-        "id": "4c583cb3.a2e9b4",
+        "id": "13b713a3.91f76c",
         "type": "switchNode",
         "name": "switch param capability-name == execution",
         "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1148.357521057129,
-        "y": 516.9999752044678,
-        "z": "303dc9e1.28f7b6",
+        "x": 1144.0718002319336,
+        "y": 489.8571186065674,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "b2f5ce63.5ec31"
+                "9add8e.52bc827"
             ]
         ]
     },
     {
-        "id": "b2f5ce63.5ec31",
+        "id": "9add8e.52bc827",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1411.857521057129,
-        "y": 517.2499752044678,
-        "z": "303dc9e1.28f7b6",
+        "x": 1407.5718002319336,
+        "y": 490.1071186065674,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "6eaca446.a10d9c"
+                "31a0dcaa.e444d4"
             ]
         ]
     },
     {
-        "id": "17e4f190.77d57e",
+        "id": "2bd33584.bf077a",
         "type": "call",
         "name": "call ss.capability-dg",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1572.071632385254,
-        "y": 696.0238490104675,
-        "z": "303dc9e1.28f7b6",
+        "x": 1567.7859115600586,
+        "y": 668.8809924125671,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "d6448b55.e69ab8",
-                "87e5a636.7bc3f8"
+                "77db13fe.aefb4c",
+                "9f0aca9e.506ad8"
             ]
         ]
     },
     {
-        "id": "53aeb795.8d7128",
+        "id": "975deb30.c1c768",
         "type": "set",
         "name": "ss.capability-name",
         "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order[]\n-->\n",
         "comments": "",
-        "x": 738.3928985595703,
-        "y": 328.4167022705078,
-        "z": "303dc9e1.28f7b6",
+        "x": 734.107177734375,
+        "y": 301.2738456726074,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "d15480d3.12273",
+        "id": "eb9f0d00.5c804",
         "type": "set",
         "name": "tmp.param.capability-name",
         "xml": "<set>\n<parameter name='tmp.param.capability-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
         "comments": "",
-        "x": 1097.7145462036133,
-        "y": 471.60718536376953,
-        "z": "303dc9e1.28f7b6",
+        "x": 1093.428825378418,
+        "y": 444.46432876586914,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "fc9f38f4.0c2118",
+        "id": "62184d5d.c851c4",
         "type": "set",
         "name": "set ss.capability.action = unassign",
         "xml": "<set>\n<parameter name='ss.capability-action' value='unassign' />\n",
         "comments": "",
-        "x": 785.1070404052734,
-        "y": 375.3332862854004,
-        "z": "303dc9e1.28f7b6",
+        "x": 780.8213195800781,
+        "y": 348.1904296875,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "d6448b55.e69ab8",
+        "id": "77db13fe.aefb4c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1756.9641418457031,
-        "y": 696.0239100456238,
-        "z": "303dc9e1.28f7b6",
+        "x": 1752.6784210205078,
+        "y": 668.8810534477234,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "2977dc30.549ee4"
+                "54d35865.3f3408"
             ]
         ]
     },
     {
-        "id": "88725cd7.d671f",
+        "id": "1c990616.a2478a",
         "type": "set",
         "name": "set capability-dg",
         "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
         "comments": "",
-        "x": 729.5357284545898,
-        "y": 424.22620010375977,
-        "z": "303dc9e1.28f7b6",
+        "x": 725.2500076293945,
+        "y": 397.0833435058594,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "cd466606.4c16b8",
+        "id": "c5498b4d.da47d8",
         "type": "execute",
         "name": "generate ss-vnf url replace service-instance-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vnf-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2239.8215255737305,
-        "y": 749.9056353569031,
-        "z": "303dc9e1.28f7b6",
+        "x": 2235.535804748535,
+        "y": 722.7627787590027,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "facf39f.6d396c8",
+        "id": "c17c35b8.41b0c8",
         "type": "execute",
         "name": "execute RestApiCallNode - PUT vnf",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vnf\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209.285820007324,
-        "y": 852.7628569602966,
-        "z": "303dc9e1.28f7b6",
+        "x": 2205.000099182129,
+        "y": 825.6200003623962,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "d6b3aa2.7030758",
-                "4ad4756c.b7b35c"
+                "f2f91617.d6bf78",
+                "8fd41743.fdec58"
             ]
         ]
     },
     {
-        "id": "d6b3aa2.7030758",
+        "id": "f2f91617.d6bf78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2483.8794860839844,
-        "y": 906.7610106468201,
-        "z": "303dc9e1.28f7b6",
+        "x": 2479.593765258789,
+        "y": 879.6181540489197,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "f21e0168.83df2"
+                "39855d48.9c0d72"
             ]
         ]
     },
     {
-        "id": "4ad4756c.b7b35c",
+        "id": "8fd41743.fdec58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2476.308120727539,
-        "y": 853.2610306739807,
-        "z": "303dc9e1.28f7b6",
+        "x": 2472.0223999023438,
+        "y": 826.1181740760803,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "f21e0168.83df2"
+                "39855d48.9c0d72"
             ]
         ]
     },
     {
-        "id": "f21e0168.83df2",
+        "id": "39855d48.9c0d72",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2678.440444946289,
-        "y": 852.905285358429,
-        "z": "303dc9e1.28f7b6",
+        "x": 2674.1547241210938,
+        "y": 825.7624287605286,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "3798eb1e.07c1a4"
+                "86aab38.e72235"
             ]
         ]
     },
     {
-        "id": "3798eb1e.07c1a4",
+        "id": "86aab38.e72235",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error persisting self-serve vnf assignments in MD-SAL during unassign\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2896.7262115478516,
-        "y": 853.0481486320496,
-        "z": "303dc9e1.28f7b6",
+        "x": 2892.4404907226562,
+        "y": 825.9052920341492,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4697d10.10b26",
+        "id": "662286b2.d6b178",
         "type": "set",
         "name": "set vf data for restapi-call-node",
         "xml": "<set>\n<parameter name='vf.vnf-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />\n<parameter name='vf.vnf-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />\n<parameter name='vf.vnf-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />\n<parameter name='vf.vnf-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />\n<parameter name='vf.vnf-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />\n<parameter name='vf.vnf-data.vnf-request-input.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='vf.vnf-data.vnf-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />\n<parameter name='vf.vnf-data.vnf-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />",
         "comments": "",
-        "x": 2192.273826599121,
-        "y": 696.0001473426819,
-        "z": "303dc9e1.28f7b6",
+        "x": 2187.988105773926,
+        "y": 668.8572907447815,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "f5cfb551.80d6c8",
+        "id": "4e2b6ad5.c5c984",
         "type": "execute",
         "name": "generate ss-vnf url - replace vnf-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vnf-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2204.1072311401367,
-        "y": 800.714403629303,
-        "z": "303dc9e1.28f7b6",
+        "x": 2199.8215103149414,
+        "y": 773.5715470314026,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "2977dc30.549ee4",
+        "id": "54d35865.3f3408",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1917.9168167114258,
-        "y": 695.7620215415955,
-        "z": "303dc9e1.28f7b6",
+        "x": 1913.6310958862305,
+        "y": 668.6191649436951,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "cd466606.4c16b8",
-                "facf39f.6d396c8",
-                "d4697d10.10b26",
-                "f5cfb551.80d6c8",
-                "d61e4f37.d59c8"
+                "c5498b4d.da47d8",
+                "c17c35b8.41b0c8",
+                "662286b2.d6b178",
+                "4e2b6ad5.c5c984",
+                "25354232.f6ff7e"
             ]
         ]
     },
     {
-        "id": "d61e4f37.d59c8",
+        "id": "25354232.f6ff7e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to unassign self-serve vnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`\" />\n",
         "comments": "",
-        "x": 2138.8217849731445,
-        "y": 980.5358049869537,
-        "z": "303dc9e1.28f7b6",
+        "x": 2134.536064147949,
+        "y": 953.3929483890533,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "f9a09d54.7ab46",
+        "id": "434ab0d7.7891",
         "type": "execute",
         "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnf-unassign.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 406.26222229003906,
-        "y": 1234.6311283111572,
-        "z": "303dc9e1.28f7b6",
+        "x": 401.97650146484375,
+        "y": 1207.4882717132568,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "9cf90cf3.4244d",
+        "id": "716b81a4.0f5df",
         "type": "set",
         "name": "set ss.capability.execution-order[]",
         "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[1]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[3]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[8]' value='generate-name' />\n<parameter name='ss.capability.execution-order_length' value='9' />",
         "comments": "",
-        "x": 488.9643325805664,
-        "y": 194.71429061889648,
-        "z": "303dc9e1.28f7b6",
+        "x": 484.6786117553711,
+        "y": 167.5714340209961,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "c41a4b38.3c8b38",
+        "id": "138a6bf3.2831e4",
         "type": "set",
         "name": "set ss.capability-type = vnf",
         "xml": "<set>\n<parameter name='ss.capability-type' value='vnf' />\n",
         "comments": "",
-        "x": 468.5714340209961,
-        "y": 234.2857208251953,
-        "z": "303dc9e1.28f7b6",
+        "x": 464.2857131958008,
+        "y": 207.14286422729492,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "f1d7b373.953da",
+        "id": "beee7743.7ea5e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1357.2737617492676,
-        "y": 763.511917591095,
-        "z": "303dc9e1.28f7b6",
+        "x": 1352.9880409240723,
+        "y": 736.3690609931946,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "770743b2.c0595c"
+                "c149b7eb.e0bad8"
             ]
         ]
     },
     {
-        "id": "770743b2.c0595c",
+        "id": "c149b7eb.e0bad8",
         "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=\"`'SS: resource-resolution-data.status: ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`\"/>\n<parameter name=\"field2\" value=\"`'SS: ss.capability-name: ' + $ss.capability-name`\"/>\n<parameter name=\"field3\" value=\"`'SS: tmp.param.capability-name: ' + $tmp.param.capability-name`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1505.3809432983398,
-        "y": 763.5476231575012,
-        "z": "303dc9e1.28f7b6",
+        "x": 1501.0952224731445,
+        "y": 736.4047665596008,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "6eaca446.a10d9c",
+        "id": "31a0dcaa.e444d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 807.1428298950195,
-        "y": 695.6666359901428,
-        "z": "303dc9e1.28f7b6",
+        "x": 802.8571090698242,
+        "y": 668.5237793922424,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "ae3d848d.b63f78",
-                "13c9ccf0.5ce9c3"
+                "a44b8cdb.fe5b2",
+                "73638f7e.a5e31"
             ]
         ]
     },
     {
-        "id": "ae3d848d.b63f78",
+        "id": "a44b8cdb.fe5b2",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 985.5714721679688,
-        "y": 1128.2381744384766,
-        "z": "303dc9e1.28f7b6",
+        "x": 981.2857513427734,
+        "y": 1101.0953178405762,
+        "z": "2e6e6d50.2c5192",
         "wires": []
     },
     {
-        "id": "87e5a636.7bc3f8",
+        "id": "9f0aca9e.506ad8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1784.4643249511719,
-        "y": 881.964298248291,
-        "z": "303dc9e1.28f7b6",
+        "x": 1780.1786041259766,
+        "y": 854.8214416503906,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "c5b341ce.afbb1"
+                "88d0c6a.b2d2838"
             ]
         ]
     },
     {
-        "id": "c5b341ce.afbb1",
+        "id": "88d0c6a.b2d2838",
         "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: ' + $ss.capability-dg`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1928.2143249511719,
-        "y": 880.714298248291,
-        "z": "303dc9e1.28f7b6",
+        "x": 1923.9286041259766,
+        "y": 853.5714416503906,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4639d29.fba05",
+        "id": "fbe1b133.89212",
         "type": "execute",
         "name": "execute PropertiesNode",
         "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": 877.7143685477122,
-        "y": 281.0000043596541,
-        "z": "303dc9e1.28f7b6",
+        "x": 873.4286477225169,
+        "y": 253.85714776175382,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             []
         ]
     },
     {
-        "id": "59a68f10.20a5",
+        "id": "af88c68d.542008",
         "type": "switchNode",
         "name": "switch prop.controller.user",
         "xml": "<switch test='`$prop.controller.user`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 466.42860412597656,
-        "y": 281.4286251068115,
-        "z": "303dc9e1.28f7b6",
+        "x": 462.14288330078125,
+        "y": 254.28576850891113,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "e826631e.9bcf2"
+                "609ed85f.bc0518"
             ]
         ]
     },
     {
-        "id": "e826631e.9bcf2",
+        "id": "609ed85f.bc0518",
         "type": "failure",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 666.2856995718821,
-        "y": 281.0000396456038,
-        "z": "303dc9e1.28f7b6",
+        "x": 661.9999787466868,
+        "y": 253.85718304770353,
+        "z": "2e6e6d50.2c5192",
         "wires": [
             [
-                "a4639d29.fba05"
+                "fbe1b133.89212"
             ]
         ]
     }
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 3fbd3f58..83427b5b 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -110,8 +110,13 @@ GENERIC-RESOURCE-API security-zone-topology-operation ${project.version} sync
 GENERIC-RESOURCE-API self-serve-aai-vf-module-put ${project.version} sync
 GENERIC-RESOURCE-API self-serve-aai-vnf-put ${project.version} sync
 GENERIC-RESOURCE-API self-serve-capability-param-resolution ${project.version} sync
+GENERIC-RESOURCE-API self-serve-pnf-generate-name ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vnf-generate-name ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vf-module-generate-name ${project.version} sync
 GENERIC-RESOURCE-API self-serve-generate-name ${project.version} sync
 GENERIC-RESOURCE-API self-serve-generate-name-changeassign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vnf-generate-name-changeassign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-vf-module-generate-name-changeassign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-mS-mac-address-assign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-mS-vlan-tag-assign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-netbox-ip-assign ${project.version} sync
@@ -126,6 +131,9 @@ GENERIC-RESOURCE-API self-serve-vnf-changeassign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-ra-assignment ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-unassign ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-forking-logic ${project.version} sync
+GENERIC-RESOURCE-API self-serve-pnf-assign ${project.version} sync
+GENERIC-RESOURCE-API self-serve-pnf-ra-assignment ${project.version} sync
+GENERIC-RESOURCE-API self-serve-pnf-unassign ${project.version} sync
 GENERIC-RESOURCE-API service-topology-operation-assign ${project.version} sync
 GENERIC-RESOURCE-API service-topology-operation-changeassign ${project.version} sync
 GENERIC-RESOURCE-API service-topology-operation-deactivate ${project.version} sync
@@ -166,6 +174,7 @@ GENERIC-RESOURCE-API validate-sotn-network-input-parameters ${project.version} s
 GENERIC-RESOURCE-API validate-tunnelxconn-input ${project.version} sync
 GENERIC-RESOURCE-API validate-vf-module-input ${project.version} sync
 GENERIC-RESOURCE-API validate-vnf-input ${project.version} sync
+GENERIC-RESOURCE-API validate-pnf-input ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-assign-rollback ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-activate ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-assign-no-preload ${project.version} sync
@@ -186,6 +195,11 @@ GENERIC-RESOURCE-API vnf-topology-operation-changeassign ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-unassign ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation ${project.version} sync
+GENERIC-RESOURCE-API pnf-topology-operation-activate ${project.version} sync
+GENERIC-RESOURCE-API pnf-topology-operation-assign ${project.version} sync
+GENERIC-RESOURCE-API pnf-topology-operation-deactivate ${project.version} sync
+GENERIC-RESOURCE-API pnf-topology-operation-unassign ${project.version} sync
+GENERIC-RESOURCE-API pnf-topology-operation ${project.version} sync
 SUBNET-API managed-network-notification ${project.version} sync
 SUBNET-API subnet-allocated-notification ${project.version} sync
 GENERIC-RESOURCE-API sdwan-network-topology-operation-activate ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
new file mode 100644
index 00000000..48bffb44
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-unassign.xml
@@ -0,0 +1,93 @@
+<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}'>
+    <method rpc='pnf-topology-operation-unassign' mode='sync'>
+        <block atomic="true">
+            <switch test='`$pnf-topology-operation-input.request-information.request-action`'>
+                <outcome value='DeletePnfInstance'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="If svc-action is 'unassign' then request-action must be 'DeletePnfInstance'" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$service-data.pnfs.pnf_length`'>
+                <outcome value=''>
+                    <return status='success'>
+                        <parameter name="ack-final-indicator" value="Y" />
+                        <parameter name="error-code" value="200" />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <for index='idx' start='0' end='`$service-data.pnfs.pnf_length`' >
+                            <switch test='`$service-data.pnfs.pnf[$idx].pnf-id == $pnf-topology-operation-input.pnf-details.pnf-id`' >
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='pnf-index' value='`$idx`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$pnf-index`'>
+                            <outcome value=''>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <block atomic="true">
+                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-unassign' mode='sync' >
+                                        <outcome value='success'>
+                                            <switch test='`$service-data.pnfs.pnf_length`'>
+                                                <outcome value='1'>
+                                                    <set>
+                                                        <parameter name="service-data.pnfs." value=""/>
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <block atomic="true">
+                                                        <for index='idx' start='`$pnf-index + 1`' end='`$service-data.pnfs.pnf_length`' >
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name="$tmpidx" value="`$idx - 1`"/>
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name="service-data.pnfs.pnf[$tmpidx]." value="" />
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name="service-data.pnfs.pnf[$tmpidx]." value="$service-data.pnfs.pnf[$idx]." />
+                                                                </set>
+                                                            </block>
+                                                        </for>
+                                                        <set>
+                                                            <parameter name="service-data.pnfs.pnf[$service-data.pnfs.pnf_length - 1]." value=""/>
+                                                        </set>
+                                                        <set>
+                                                            <parameter name="service-data.pnfs.pnf_length" value="`$service-data.pnfs.pnf_length - 1`"/>
+                                                        </set>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='500' />
+                                                <parameter name='error-message' value="`'Encountered error while unassigning self-serve  pnf resources with error: '+ $error-message`" />
+                                            </return>
+                                        </outcome>
+                                    </call>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
index 2afe8be1..d3dce914 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
@@ -182,6 +182,95 @@
                         </outcome>
                     </switch>
                 </outcome>
+                <outcome value='pnf'>
+                    <switch test="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length == ''`">
+                        <outcome value='false'>
+                            <for silentFailure='true' index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                                <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                    <outcome value='true'>
+                                        <switch test="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length == ''`">
+                                            <outcome value='false'>
+                                                <for silentFailure='true' index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
+                                                        <parameter name="source" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`" />
+                                                        <parameter name="target" value="$"/>
+                                                        <outcome value='true'>
+                                                            <block atomic='true'>
+                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                    <parameter name="logger" value="message-log"/>
+                                                                    <parameter name="field1" value="`'SS: param[].value with leading $: ' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                                </record>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
+                                                                    <parameter name='original_string' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />
+                                                                    <parameter name='regex' value='\$\{' />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name="tmp.s1" value='`$resource-resolution-split[0]`'/>
+                                                                    <parameter name="tmp.s2.s2" value=''/>
+                                                                    <parameter name="tmp.resolved.var.value" value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='s2' />
+                                                                    <parameter name='original_string' value='`$resource-resolution-split[1]`' />
+                                                                    <parameter name='regex' value='\}' />
+                                                                </execute>
+                                                                <switch test='`$s2_length`'>
+                                                                    <outcome value='1'>
+                                                                        <set>
+                                                                            <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                        </set>
+                                                                    </outcome>
+                                                                    <outcome value='2'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                            </set>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s2" value='`$s2[1]`'/>
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <for silentFailure='true' index='cn' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                                                                    <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>
+                                                                        <outcome value='true'>
+                                                                            <set>
+                                                                                <parameter name='tmp.resolved.var.value' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cn].value`'/>
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                    <parameter name='source' value='`$tmp.s1`' />
+                                                                    <parameter name='target' value='`$tmp.resolved.var.value`' />
+                                                                    <parameter name='outputPath' value='tmp.result' />
+                                                                </execute>
+                                                                <switch test="`$tmp.s2.s2 == ''`">
+                                                                    <outcome value='true'></outcome>
+                                                                    <outcome value='false'>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                            <parameter name='source' value='`$tmp.result`' />
+                                                                            <parameter name='target' value='`$tmp.s2.s2`' />
+                                                                            <parameter name='outputPath' value='tmp.result' />
+                                                                        </execute>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <set>
+                                                                    <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                </for>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                </outcome>
             </switch>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
index 6456f73b..a8ef58de 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
@@ -1,213 +1,50 @@
-<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}'>
-    <method rpc='self-serve-generate-name-changeassign' mode='sync'>
-        <block atomic="true">
-            <switch test='`$ss.input.param.index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="ss.input.param.index is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$ss.service-data.param.index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="ss.service-data.param.index is null" />
-                    </return>
-                </outcome>
-            </switch>
-            <switch test='`$ss.capability-type`'>
-                <outcome value='vnf'>
-                    <block atomic='true'>
-                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
-                                <outcome value='external-key'>
-                                    <set>
-                                        <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.external-key.value`'>
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="self-service-generate-name-changeassign error : external-key is null for vnf" />
-                                </return>
-                            </outcome>
-                        </switch>
-                        <set>
-                            <parameter name="tmp.vnf.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
-                        </set>
-                        <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
-                            <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />
-                            <parameter name="prifix" value="vnf.changeassign.nameGenResponse" />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vnf ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vnf ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </execute>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="generic-vnf"
-		key="generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id " >
-                            <parameter name="vnf-name" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Failed to update generic-vnf.vnf-name to ' + $ss.changeassign.vnf-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Failed to update generic-vnf.vnf-name to ' + $ss.changeassign.vnf-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </update>
-                        <set>
-                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].value`' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`'/>
-                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
-                        </set>
-                    </block>
-                </outcome>
-                <outcome value='vf-module'>
-                    <block atomic='true'>
-                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
-                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
-                                <outcome value='external-key'>
-                                    <set>
-                                        <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </for>
-                        <switch test='`$tmp.external-key.value`'>
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="self-service-generate-name-changeassign error : external-key is null for vf-module" />
-                                </return>
-                            </outcome>
-                        </switch>
-                        <set>
-                            <parameter name="tmp.vf-module.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
-                        </set>
-                        <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
-                            <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />
-                            <parameter name="prifix" value="vf-module.changeassign.nameGenResponse" />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <set>
-                                        <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vf-module ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <set>
-                                        <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vf-module ' + $error-message`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </execute>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="vf-module" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id " >
-                            <parameter name="vf-module-name" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <set>
-                                        <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Failed to update vf-module.vf-module-name to ' + $ss.changeassign.vf-module-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <set>
-                                        <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
-                                    </set>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'Failed to update vf-module.vf-module-name to ' + $ss.changeassign.vf-module-name + ' in AnAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                        </update>
-                        <set>
-                            <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[$ss.service-data.param.index].value`' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`'/>
-                            <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[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
-                        </set>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="capability-type is not vnf or vf-module" />
-                    </return>
-                </outcome>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="capability-type is not vnf or vf-module" />
-                    </return>
-                </outcome>
-            </switch>
-        </block>
-    </method>
+<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}'>
+    <method rpc='self-serve-generate-name-changeassign' mode='sync'>
+        <block atomic="true">
+            <switch test='`$prop.controller.user`'>
+                <outcome value=''>
+                    <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>
+                </outcome>
+            </switch>
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' ></call>
+            <switch test='`$ss.input.param.index`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="ss.input.param.index is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$ss.service-data.param.index`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="ss.service-data.param.index is null" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$ss.capability-type`'>
+                <outcome value='vnf'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name-changeassign' mode='sync' ></call>
+                </outcome>
+                <outcome value='vf-module'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name-changeassign' mode='sync' ></call>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'Unknown capability-type [' + $ss.capability-type + '], valid value are: vnf, pnf, vf-module'`" />
+                    </return>
+                </outcome>
+            </switch>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
index 294ce772..c6b5a9ab 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
@@ -3,616 +3,29 @@
     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='self-serve-generate-name' mode='sync'>
         <block atomic="true">
-            <set>
-                <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-            </set>
-            <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>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error from capability-param-resolution" />
-                    </return>
+            <switch test='`$prop.controller.user`'>
+                <outcome value=''>
+                    <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>
                 </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="Error from capability-param-resolution" />
-                    </return>
+            </switch>
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' ></call>
+            <switch test="`$ss.capability-type`">
+                <outcome value='vnf'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-generate-name' mode='sync' ></call>
                 </outcome>
-            </call>
-            <switch test="`$ss.capability-type == 'vnf'`">
-                <outcome value='true'>
-                    <block>
-                        <switch test="`$ss.capability-action == 'unassign'`">
-                            <outcome value='true'>
-                                <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                                    <parameter name='tmp.gen-name_length' value='1' />
-                                                </set>
-                                                <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
-                                                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
-                                                        <outcome value='true'>
-                                                            <set>
-                                                                <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
-                                                                <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
-                                                                <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
-                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',}' />
-                                                    <parameter name='replacement' value='}' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',]' />
-                                                    <parameter name='replacement' value=']' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='DELETE' />
-                                                    <parameter name="responsePrefix" value="nameGenResponse" />
-                                                    <outcome value='failure'>
-                                                        <block>
-                                                            <set>
-                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block>
-                                                            <set>
-                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                </execute>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <parameter name="outputPath" value="jsonContextPrefix" />
-                                                    <parameter name="isEscaped" value="false" />
-                                                </execute>
-                                                <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
-                                                    <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                                        <outcome value='true'>
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='DELETED' />
-                                                                                </set>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                            </outcome>
-                        </switch>
-                        <switch test="`$ss.capability-action == 'assign'`">
-                            <outcome value='true'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-                                        <parameter name='tmp.gen-name_length' value='0' />
-                                    </set>
-                                    <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
-                                            <outcome value='true'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                                    </set>
-                                                    <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
-                                                        <set>
-                                                            <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
-                                                        </set>
-                                                    </for>
-                                                    <set>
-                                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
-                                                    </set>
-                                                </block>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <switch test="`$tmp.naming-data-payload == ''`">
-                                        <outcome value='false'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',}' />
-                                                    <parameter name='replacement' value='}' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',]' />
-                                                    <parameter name='replacement' value=']' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='POST' />
-                                                    <parameter name="responsePrefix" value="nameGenResponse" />
-                                                    <outcome value='failure'>
-                                                        <block>
-                                                            <set>
-                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block>
-                                                            <set>
-                                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                </execute>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <parameter name="outputPath" value="jsonContextPrefix" />
-                                                    <parameter name="isEscaped" value="false" />
-                                                </execute>
-                                                <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
-                                                    <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                                        <outcome value='true'>
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
-                                                                                </set>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                                <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                        <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`" />
-                                                        <parameter name="target" value="$"/>
-                                                        <outcome value='false'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.capability-name`' value='INPUT' />
-                                                                </set>
-                                                                <set>
-                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
+                <outcome value='vf-module'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-generate-name' mode='sync' ></call>
                 </outcome>
-            </switch>
-            <switch test="`$ss.capability-type == 'vf-module'`">
-                <outcome value='true'>
-                    <block>
-                        <switch test="`$ss.capability-action == 'unassign'`">
-                            <outcome value='true'>
-                                <for index='i' 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`' >
-                                    <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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                                    <parameter name='tmp.gen-name_length' value='1' />
-                                                </set>
-                                                <for index='j' 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[$i].resource-resolution-data.resource-key_length`' >
-                                                    <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[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
-                                                        <outcome value='true'>
-                                                            <set>
-                                                                <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
-                                                                <parameter name="`tmp.gen-name[0].element[$j].name`" 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[$i].resource-resolution-data.resource-key[$j].name`"/>
-                                                                <parameter name="`tmp.gen-name[0].element[$j].value`" 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[$i].resource-resolution-data.resource-key[$j].value`"/>
-                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
-                                                            </set>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',}' />
-                                                    <parameter name='replacement' value='}' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',]' />
-                                                    <parameter name='replacement' value=']' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='DELETE' />
-                                                    <parameter name="responsePrefix" value="nameGenResponse" />
-                                                    <outcome value='failure'>
-                                                        <block>
-                                                            <set>
-                                                                <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[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block>
-                                                            <set>
-                                                                <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[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                </execute>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <parameter name="outputPath" value="jsonContextPrefix" />
-                                                    <parameter name="isEscaped" value="false" />
-                                                </execute>
-                                                <set>
-                                                    <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[$i].resource-resolution-data.status`' value='DELETED' />
-                                                </set>
-                                                <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
-                                                    <for index='l' 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`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <parameter name="source" 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[$l].value`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' 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[$l].value`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </for>
-                            </outcome>
-                        </switch>
-                        <switch test="`$ss.capability-action == 'assign'`">
-                            <outcome value='true'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
-                                        <parameter name='tmp.gen-name_length' value='0' />
-                                    </set>
-                                    <for index='i' 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`' >
-                                        <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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
-                                            <outcome value='true'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
-                                                    </set>
-                                                    <for index='j' 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[$i].resource-resolution-data.resource-key_length`' >
-                                                        <set>
-                                                            <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" 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[$i].resource-resolution-data.resource-key[$j].name`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" 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[$i].resource-resolution-data.resource-key[$j].value`"/>
-                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
-                                                        </set>
-                                                    </for>
-                                                    <set>
-                                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
-                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
-                                                    </set>
-                                                </block>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <switch test="`$tmp.naming-data-payload == ''`">
-                                        <outcome value='false'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',}' />
-                                                    <parameter name='replacement' value='}' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
-                                                    <parameter name='outputPath' value='tmp.naming-data-payload' />
-                                                    <parameter name='source' value='`$tmp.naming-data-payload`' />
-                                                    <parameter name='target' value=',]' />
-                                                    <parameter name='replacement' value=']' />
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
-                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
-                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
-                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
-                                                    <parameter name='format' value='json' />
-                                                    <parameter name='httpMethod' value='POST' />
-                                                    <parameter name="responsePrefix" value="nameGenResponse" />
-                                                    <outcome value='failure'>
-                                                        <block>
-                                                            <set>
-                                                                <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[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='not-found'>
-                                                        <block>
-                                                            <set>
-                                                                <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[$i].resource-resolution-data.status`' value='FAILED' />
-                                                            </set>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="Error from NameGenerationNode Assign" />
-                                                            </return>
-                                                        </block>
-                                                    </outcome>
-                                                </execute>
-                                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                                                    <parameter name="source" value="nameGenResponse.httpResponse" />
-                                                    <parameter name="outputPath" value="jsonContextPrefix" />
-                                                    <parameter name="isEscaped" value="false" />
-                                                </execute>
-                                                <set>
-                                                    <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[$i].resource-resolution-data.status`' value='SUCCESS' />
-                                                </set>
-                                                <for index='cn' 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`' >
-                                                    <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[$cn].name == 'vnfc-name'`">
-                                                        <outcome value='true'>
-                                                            <for silentFailure='true' index='j' 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[$cn].resource-resolution-data.resource-key_length`' >
-                                                                <block>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'vm-type'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].vm-type`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'model-invariant-uuid'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-invariant-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'model-customization-uuid'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-customization-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'model-uuid'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-uuid`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'model-version'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-version`' 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[$cn].resource-resolution-data.resource-key[j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'model-name'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].onap-model-information.model-name`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                    <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[$cn].resource-resolution-data.resource-key[$j].name == 'vnfc-name'`">
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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-assignments.vms.vm[0].vm-names.vnfc-names[0].vnfc-name`' 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[$cn].resource-resolution-data.resource-key[$j].value`' />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </for>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                                <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
-                                                    <for index='l' 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`' >
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                            <parameter name="source" 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[$l].value`" />
-                                                            <parameter name="target" value="$"/>
-                                                            <outcome value='true'>
-                                                                <block>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                                        <parameter name='original_string' 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[$l].value`' />
-                                                                        <parameter name='regex' value='\$\{' />
-                                                                    </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                                        <parameter name='ctx_memory_result_key' value='s2' />
-                                                                        <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                                        <parameter name='regex' value='\}' />
-                                                                    </execute>
-                                                                    <switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>
-                                                                        <outcome value='true'>
-                                                                            <set>
-                                                                                <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[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
-                                                                            </set>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </for>
-                                                </for>
-                                                <for index='l' 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`' >
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                        <parameter name="source" 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[$l].value`" />
-                                                        <parameter name="target" value="$"/>
-                                                        <outcome value='false'>
-                                                            <block>
-                                                                <set>
-                                                                    <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[$l].resource-resolution-data.capability-name`' value='INPUT' />
-                                                                </set>
-                                                                <set>
-                                                                    <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[$l].resource-resolution-data.status`' value='SUCCESS' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
+                <outcome value='pnf'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-generate-name' mode='sync' ></call>
                 </outcome>
             </switch>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                <parameter name='filename' value='`$pathname`' />
+            </execute>
         </block>
     </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
new file mode 100644
index 00000000..bded0cb5
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-generate-name.xml
@@ -0,0 +1,233 @@
+<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}'>
+    <method rpc='self-serve-pnf-generate-name' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='pathname' 
+	value="`'/var/tmp/ss-gen-name-' + 
+	$ss.capability-type + '-' + $ss.capability-action + '-' + 
+	$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.pnf-id + '.log'`" />
+            </set>
+            <switch test="`$ss.capability-action`">
+                <outcome value='unassign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                        </set>
+                        <for index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+                                            <parameter name='tmp.gen-name_length' value='1' />
+                                        </set>
+                                        <for index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                            <switch test="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                        <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                        </set>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
+                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                            <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                            <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                            <parameter name='target' value=',}' />
+                                            <parameter name='replacement' value='}' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                            <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                            <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                            <parameter name='target' value=',]' />
+                                            <parameter name='replacement' value=']' />
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="BEFORE namegeneration.node.UnAssignNameNode"/>
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                            <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                            <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='DELETE' />
+                                            <parameter name="responsePrefix" value="nameGenResponse" />
+                                            <outcome value='failure'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                    </set>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='not-found'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                    </set>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="AFTER namegeneration.node.UnAssignNameNode"/>
+                                        </record>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                            <parameter name="source" value="nameGenResponse.httpResponse" />
+                                            <parameter name="outputPath" value="jsonContextPrefix" />
+                                            <parameter name="isEscaped" value="false" />
+                                        </execute>
+                                        <set>
+                                            <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />
+                                        </set>
+                                        <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='assign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                            <parameter name='tmp.gen-name_length' value='0' />
+                        </set>
+                        <for index='i' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+                                        </set>
+                                        <for index='j' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                            <set>
+                                                <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
+                                            </set>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                            <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.naming-data-payload == ''`">
+                            <outcome value='false'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
+                                    </set>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                        <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                        <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                        <parameter name='target' value=',}' />
+                                        <parameter name='replacement' value='}' />
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                        <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                        <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                        <parameter name='target' value=',]' />
+                                        <parameter name='replacement' value=']' />
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value="BEFORE namegeneration.node.AssignNameNode"/>
+                                    </record>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                        <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                        <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='POST' />
+                                        <parameter name="responsePrefix" value="nameGenResponse" />
+                                        <outcome value='failure'>
+                                            <block>
+                                                <set>
+                                                    <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="Error from NameGenerationNode Assign" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <block>
+                                                <set>
+                                                    <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="Error from NameGenerationNode Assign" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value="AFTER namegeneration.node.AssignNameNode"/>
+                                    </record>
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                        <parameter name="source" value="nameGenResponse.httpResponse" />
+                                        <parameter name="outputPath" value="jsonContextPrefix" />
+                                        <parameter name="isEscaped" value="false" />
+                                    </execute>
+                                    <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                        <for index='l' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                                            <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                        <parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </for>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
new file mode 100644
index 00000000..2fc4a3ae
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-unassign.xml
@@ -0,0 +1,143 @@
+<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}'>
+    <method rpc='self-serve-pnf-unassign' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='ss.capability.execution-order[0]' value='mS-mac-address-assign' />
+                <parameter name='ss.capability.execution-order[1]' value='mac-address-assign' />
+                <parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />
+                <parameter name='ss.capability.execution-order[3]' value='eipam-ip-assignment' />
+                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[5]' value='vlan-tag-assign' />
+                <parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />
+                <parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />
+                <parameter name='ss.capability.execution-order[8]' value='generate-name' />
+                <parameter name='ss.capability.execution-order_length' value='9' />
+            </set>
+            <set>
+                <parameter name='ss.capability-type' value='pnf' />
+            </set>
+            <switch test='`$prop.controller.user`'>
+                <outcome value=''>
+                    <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>
+                </outcome>
+            </switch>
+            <for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >
+                <set>
+                    <parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />
+                    <!--
+ss.capability.execution-order[]
+-->
+                </set>
+                <set>
+                    <parameter name='ss.capability-action' value='unassign' />
+                </set>
+                <set>
+                    <parameter name='ss.capability-dg' value="`'self-serve-' + $ss.capability.execution-order[$cidx]`" />
+                </set>
+                <for index='pidx' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >
+                    <set>
+                        <parameter name='tmp.param.capability-name' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />
+                    </set>
+                    <switch test='`$ss.capability-name == $tmp.param.capability-name`'>
+                        <outcome value='true'>
+                            <block atomic='true'>
+                                <switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+                                    <outcome value='SUCCESS'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='vf.pnf-id'
+    value='`$service-data.pnfs.pnf[$pnf-index].pnf-id`' />
+                                                        <parameter name='vf.pnf-data.sdnc-request-header.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.sdnc-request-header.`' />
+                                                        <parameter name='vf.pnf-data.request-information.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.request-information.`' />
+                                                        <parameter name='vf.pnf-data.service-information.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.`' />
+                                                        <parameter name='vf.pnf-data.pnf-information.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.`' />
+                                                        <parameter name='vf.pnf-data.pnf-request-input.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-request-input.`' />
+                                                        <parameter name='vf.pnf-data.pnf-request-input.pnf-input-parameters.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-request-input.pnf-input-parameters.`' />
+                                                        <parameter name='vf.pnf-data.pnf-topology.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.`' />
+                                                        <parameter name='vf.pnf-data.pnf-level-oper-status.'
+  value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.`' />
+                                                    </set>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.ss-pnf-assignments`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-pnf-url"/>
+                                                        <parameter name="target" value="{service-instance-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.pnfs.pnf[$pnf-index].pnf-data.service-information.service-instance-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-pnf-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-pnf-url"/>
+                                                        <parameter name="target" value="{pnf-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.pnfs.pnf[$pnf-index].pnf-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.pnf.templatefile`" />
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-pnf-url`' />
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='httpMethod' value='PUT' />
+                                                        <parameter name="responsePrefix" value="mdsal-ss-pnf" />
+                                                        <outcome value='failure'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error persisting self-serve pnf assignments in MD-SAL during unassign" />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name="error-message" value="Error persisting self-serve pnf assignments in MD-SAL during unassign" />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'Failed to unassign self-serve pnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                    <parameter name="logger" value="message-log"/>
+                                                    <parameter name="field1" value="`'DONE: ' + $ss.capability-dg`"/>
+                                                </record>
+                                            </outcome>
+                                        </call>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="`'SS: resource-resolution-data.status: ' + $service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$pidx].resource-resolution-data.status`"/>
+                                            <parameter name="field2" value="`'SS: ss.capability-name: ' + $ss.capability-name`"/>
+                                            <parameter name="field3" value="`'SS: tmp.param.capability-name: ' + $tmp.param.capability-name`"/>
+                                        </record>
+                                    </outcome>
+                                </switch>
+                                <break/>
+                            </block>
+                        </outcome>
+                    </switch>
+                </for>
+            </for>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                <parameter name='filename' value='/var/tmp/ss-pnf-unassign.log' />
+            </execute>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
new file mode 100644
index 00000000..e2dc3e32
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name-changeassign.xml
@@ -0,0 +1,92 @@
+<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}'>
+    <method rpc='self-serve-vf-module-generate-name-changeassign' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='tmp.external-key.value' value='' />
+            </set>
+            <for index='i' 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[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
+                <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[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
+                    <outcome value='external-key'>
+                        <set>
+                            <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
+                        </set>
+                    </outcome>
+                </switch>
+            </for>
+            <switch test='`$tmp.external-key.value`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="self-service-vf-module-generate-name-changeassign error : external-key is null for vf-module" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="tmp.vf-module.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
+            </set>
+            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
+                <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />
+                <parameter name="prifix" value="vf-module.changeassign.nameGenResponse" />
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <set>
+                            <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vf-module ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='true'>
+                        <set>
+                            <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vf-module ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="vf-module" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id " >
+                <parameter name="vf-module-name" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <set>
+                            <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Failed to update vf-module.vf-module-name to ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='true'>
+                        <set>
+                            <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[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Failed to update vf-module.vf-module-name to ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+            </update>
+            <set>
+                <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[$ss.service-data.param.index].value`' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`'/>
+                <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[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
+            </set>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
new file mode 100644
index 00000000..01ec0d4b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-generate-name.xml
@@ -0,0 +1,233 @@
+<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}'>
+    <method rpc='self-serve-vf-module-generate-name' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='pathname' 
+	value="`'/var/tmp/ss-gen-name-' + 
+	$ss.capability-type + '-' + $ss.capability-action + '-' + 
+	$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'`" />
+            </set>
+            <switch test="`$ss.capability-action`">
+                <outcome value='unassign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                        </set>
+                        <for index='i' 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`' >
+                            <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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+                                            <parameter name='tmp.gen-name_length' value='1' />
+                                        </set>
+                                        <for index='j' 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[$i].resource-resolution-data.resource-key_length`' >
+                                            <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[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].name`" 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[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].value`" 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[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                        <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                        </set>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
+                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                            <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                            <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                            <parameter name='target' value=',}' />
+                                            <parameter name='replacement' value='}' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                            <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                            <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                            <parameter name='target' value=',]' />
+                                            <parameter name='replacement' value=']' />
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="BEFORE namegeneration.node.UnAssignNameNode"/>
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                            <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                            <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='DELETE' />
+                                            <parameter name="responsePrefix" value="nameGenResponse" />
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <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[$i].resource-resolution-data.status`' value='FAILED' />
+                                                    </set>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='not-found'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <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[$i].resource-resolution-data.status`' value='FAILED' />
+                                                    </set>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="AFTER namegeneration.node.UnAssignNameNode"/>
+                                        </record>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                            <parameter name="source" value="nameGenResponse.httpResponse" />
+                                            <parameter name="outputPath" value="jsonContextPrefix" />
+                                            <parameter name="isEscaped" value="false" />
+                                        </execute>
+                                        <set>
+                                            <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[$i].resource-resolution-data.status`' value='DELETED' />
+                                        </set>
+                                        <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                            <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[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <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[$i].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='assign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                            <parameter name='tmp.gen-name_length' value='0' />
+                        </set>
+                        <for index='i' 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`' >
+                            <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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+                                        </set>
+                                        <for index='j' 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[$i].resource-resolution-data.resource-key_length`' >
+                                            <set>
+                                                <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $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[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" 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[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" 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[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
+                                            </set>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                            <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.naming-data-payload == ''`">
+                            <outcome value='false'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
+                                    </set>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                        <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                        <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                        <parameter name='target' value=',}' />
+                                        <parameter name='replacement' value='}' />
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                        <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                        <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                        <parameter name='target' value=',]' />
+                                        <parameter name='replacement' value=']' />
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value="BEFORE namegeneration.node.AssignNameNode"/>
+                                    </record>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                        <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                        <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='POST' />
+                                        <parameter name="responsePrefix" value="nameGenResponse" />
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <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[$i].resource-resolution-data.status`' value='FAILED' />
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="Error from NameGenerationNode Assign" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <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[$i].resource-resolution-data.status`' value='FAILED' />
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="Error from NameGenerationNode Assign" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value="AFTER namegeneration.node.AssignNameNode"/>
+                                    </record>
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                        <parameter name="source" value="nameGenResponse.httpResponse" />
+                                        <parameter name="outputPath" value="jsonContextPrefix" />
+                                        <parameter name="isEscaped" value="false" />
+                                    </execute>
+                                    <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                        <for index='l' 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`' >
+                                            <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[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <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[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                        <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[$l].resource-resolution-data.status`' value='SUCCESS' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </for>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
index 5aed4fc8..543b9f5c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml
@@ -1,70 +1,70 @@
-<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}'>
-    <method rpc='self-serve-vfmodule-changeassign' mode='sync'>
-        <block atomic="true">
-            <switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="no param name/value provided in vf-module-request-input" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >
-                <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='false'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='ss.input.param.found.in.service.param' value='false' />
-                            </set>
-                            <for index='j' 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`' >
-                                <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[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <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[$j].resource-resolution-data.status`' value='PENDING'/>
-                                                <parameter name='ss.input.param.index' value='`$i`' />
-                                                <parameter name='ss.service-data.param.index' value='`$j`' />
-                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
-                                                <parameter name='ss.capability-type' value='vf-module' />
-                                                <parameter name='ss.capability-action' value='changeassign' />
-                                            </set>
-                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </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="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </outcome>
-                                            </call>
-                                            <return status='success'></return>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <switch test='`$ss.input.param.found.in.service.param`'>
-                                <outcome value='false'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'No param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`" />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </outcome>
-                </switch>
-            </for>
-        </block>
-    </method>
+<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}'>
+    <method rpc='self-serve-vfmodule-changeassign' mode='sync'>
+        <block atomic="true">
+            <switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="no param name/value provided in vf-module-request-input" />
+                    </return>
+                </outcome>
+            </switch>
+            <for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >
+                <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='false'>
+                        <block atomic='true'>
+                            <set>
+                                <parameter name='ss.input.param.found.in.service.param' value='false' />
+                            </set>
+                            <for index='j' 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`' >
+                                <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[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>
+                                    <outcome value='true'>
+                                        <block atomic='true'>
+                                            <set>
+                                                <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[$j].resource-resolution-data.status`' value='PENDING'/>
+                                                <parameter name='ss.input.param.index' value='`$i`' />
+                                                <parameter name='ss.service-data.param.index' value='`$j`' />
+                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
+                                                <parameter name='ss.capability-type' value='vf-module' />
+                                                <parameter name='ss.capability-action' value='changeassign' />
+                                            </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </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="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </outcome>
+                                            </call>
+                                            <return status='success'></return>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                            <switch test='`$ss.input.param.found.in.service.param`'>
+                                <outcome value='false'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="No vf-module-request-input.vf-module-input-parameters.param[].name found in service-data." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
index 4e049468..16da1bb7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-changeassign.xml
@@ -1,70 +1,70 @@
-<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}'>
-    <method rpc='self-serve-vnf-changeassign' mode='sync'>
-        <block atomic='true'>
-            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="no param name/value provided in vnf-request-input" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
-                <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`">
-                    <outcome value='false'>
-                        <block atomic='true'>
-                            <set>
-                                <parameter name='ss.input.param.found.in.service.param' value='false' />
-                            </set>
-                            <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>
-                                                <parameter name='ss.input.param.index' value='`$i`' />
-                                                <parameter name='ss.service-data.param.index' value='`$j`' />
-                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
-                                                <parameter name='ss.capability-type' value='vnf' />
-                                                <parameter name='ss.capability-action' value='changeassign' />
-                                            </set>
-                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </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="Error from self-service-generate-name-changeassign" />
-                                                    </return>
-                                                </outcome>
-                                            </call>
-                                            <return status='success'></return>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </for>
-                            <switch test='`$ss.input.param.found.in.service.param`'>
-                                <outcome value='false'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`'No param with param[].name = ' +  $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`" />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </outcome>
-                </switch>
-            </for>
-        </block>
-    </method>
+<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}'>
+    <method rpc='self-serve-vnf-changeassign' mode='sync'>
+        <block atomic='true'>
+            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="no param name/value provided in vnf-request-input" />
+                    </return>
+                </outcome>
+            </switch>
+            <for index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`">
+                    <outcome value='false'>
+                        <block atomic='true'>
+                            <set>
+                                <parameter name='ss.input.param.found.in.service.param' value='false' />
+                            </set>
+                            <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].name == $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>
+                                    <outcome value='true'>
+                                        <block atomic='true'>
+                                            <set>
+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$j].resource-resolution-data.status`' value='PENDING'/>
+                                                <parameter name='ss.input.param.index' value='`$i`' />
+                                                <parameter name='ss.service-data.param.index' value='`$j`' />
+                                                <parameter name='ss.input.param.found.in.service.param' value='true' />
+                                                <parameter name='ss.capability-type' value='vnf' />
+                                                <parameter name='ss.capability-action' value='changeassign' />
+                                            </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' >
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </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="Error from self-service-generate-name-changeassign" />
+                                                    </return>
+                                                </outcome>
+                                            </call>
+                                            <return status='success'></return>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                            <switch test='`$ss.input.param.found.in.service.param`'>
+                                <outcome value='false'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="No vnf-request-input.vnf-input-parameters.param[].name found in service-data." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
 </service-logic>
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
new file mode 100644
index 00000000..c8a419a4
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name-changeassign.xml
@@ -0,0 +1,94 @@
+<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}'>
+    <method rpc='self-serve-vnf-generate-name-changeassign' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='tmp.external-key.value' value='' />
+            </set>
+            <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key_length`' >
+                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].name`'>
+                    <outcome value='external-key'>
+                        <set>
+                            <parameter name='tmp.external-key.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.resource-key[$i].value`' />
+                        </set>
+                    </outcome>
+                </switch>
+            </for>
+            <switch test='`$tmp.external-key.value`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="self-service-vnf-generate-name-changeassign error : external-key is null for vnf" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name="tmp.vnf.changeassign.naming-data-payload" 
+	value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
+            </set>
+            <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
+                <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />
+                <parameter name="prifix" value="vnf.changeassign.nameGenResponse" />
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vnf ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Error from NameGenerationNode ChangeAssign vnf ' + $error-message`" />
+                        </return>
+                    </block>
+                </outcome>
+            </execute>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+	resource="generic-vnf"
+		key="generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id " >
+                <parameter name="vnf-name" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />
+                <outcome value='failure'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Failed to update generic-vnf.vnf-name to ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='FAILED' />
+                        </set>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="`'Failed to update generic-vnf.vnf-name to ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + ' in AnAI'`" />
+                        </return>
+                    </block>
+                </outcome>
+            </update>
+            <set>
+                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].value`' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`'/>
+                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.service-data.param.index].resource-resolution-data.status`' value='SUCCESS' />
+            </set>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
new file mode 100644
index 00000000..4a876794
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-generate-name.xml
@@ -0,0 +1,233 @@
+<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}'>
+    <method rpc='self-serve-vnf-generate-name' mode='sync'>
+        <block atomic='true'>
+            <set>
+                <parameter name='pathname' 
+	value="`'/var/tmp/ss-gen-name-' + 
+	$ss.capability-type + '-' + $ss.capability-action + '-' + 
+	$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`" />
+            </set>
+            <switch test="`$ss.capability-action`">
+                <outcome value='unassign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                        </set>
+                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+                                            <parameter name='tmp.gen-name_length' value='1' />
+                                        </set>
+                                        <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name == 'external-key'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                        <parameter name="`tmp.gen-name[0].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                        <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                        </set>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
+                                        </set>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                            <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                            <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                            <parameter name='target' value=',}' />
+                                            <parameter name='replacement' value='}' />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                            <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                            <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                            <parameter name='target' value=',]' />
+                                            <parameter name='replacement' value=']' />
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="BEFORE namegeneration.node.UnAssignNameNode"/>
+                                        </record>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                            <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                            <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                            <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                            <parameter name='format' value='json' />
+                                            <parameter name='httpMethod' value='DELETE' />
+                                            <parameter name="responsePrefix" value="nameGenResponse" />
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                    </set>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='not-found'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                    </set>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error from NameGenerationNode Unassign" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                        </execute>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="AFTER namegeneration.node.UnAssignNameNode"/>
+                                        </record>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                            <parameter name="source" value="nameGenResponse.httpResponse" />
+                                            <parameter name="outputPath" value="jsonContextPrefix" />
+                                            <parameter name="isEscaped" value="false" />
+                                        </execute>
+                                        <set>
+                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='DELETED' />
+                                        </set>
+                                        <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='assign'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />
+                            <parameter name='tmp.gen-name_length' value='0' />
+                        </set>
+                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <block atomic='true'>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />
+                                        </set>
+                                        <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                            <set>
+                                                <parameter name="tmp.naming-data-payload" value="`$tmp.naming-data-payload + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + '&quot;:' + '&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value + '&quot;,'`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].name`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element[$j].value`" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />
+                                            </set>
+                                        </for>
+                                        <set>
+                                            <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />
+                                            <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />
+                                        </set>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.naming-data-payload == ''`">
+                            <outcome value='false'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + ']}'`" />
+                                    </set>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                        <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                        <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                        <parameter name='target' value=',}' />
+                                        <parameter name='replacement' value='}' />
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>
+                                        <parameter name='outputPath' value='tmp.naming-data-payload' />
+                                        <parameter name='source' value='`$tmp.naming-data-payload`' />
+                                        <parameter name='target' value=',]' />
+                                        <parameter name='replacement' value=']' />
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value="BEFORE namegeneration.node.AssignNameNode"/>
+                                    </record>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />
+                                        <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />
+                                        <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />
+                                        <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='httpMethod' value='POST' />
+                                        <parameter name="responsePrefix" value="nameGenResponse" />
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="Error from NameGenerationNode Assign" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.status`' value='FAILED' />
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="Error from NameGenerationNode Assign" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log"/>
+                                        <parameter name="field1" value="AFTER namegeneration.node.AssignNameNode"/>
+                                    </record>
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+                                        <parameter name="source" value="nameGenResponse.httpResponse" />
+                                        <parameter name="outputPath" value="jsonContextPrefix" />
+                                        <parameter name="isEscaped" value="false" />
+                                    </execute>
+                                    <for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >
+                                        <for index='l' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].name == $jsonContextPrefix.elements[$n].resource-name`'>
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].value`' value="`$jsonContextPrefix.elements[$n].resource-value`" />
+                                                        <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$l].resource-resolution-data.status`' value='SUCCESS' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </for>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
index d69f4758..b640fbfa 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
@@ -136,7 +136,7 @@ ss.capability.execution-order[]
                 </for>
             </for>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
+                <parameter name='filename' value='/var/tmp/ss-vnf-unassign.log' />
             </execute>
         </block>
     </method>