From 00a4dd594c5fce63ab9961ed668c3c4bd2cbeaf9 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 9 Oct 2018 13:57:21 -0400
Subject: Multiple self-serve fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix ss-generate-name to not set SUCCESS status randomly.
fix vf-module ss dg to populate correctly the order-status
data.
add support for vnf level assignemnet for ss netbox
fix parsing resolved ip to remove prefix info (/32)

Change-Id: I1f0b5c2046dddddee1f0fa674b440d604871aa9b
Issue-ID: SDNC-444
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Former-commit-id: 1adbc091ff99771a16599d7459296dea77e69380
---
 ...ERIC-RESOURCE-API_self-serve-generate-name.json | 2028 ++++++++--------
 ...C-RESOURCE-API_self-serve-netbox-ip-assign.json | 1490 +++++++++---
 ...C-RESOURCE-API_self-serve-vf-module-assign.json | 2534 ++++++++++----------
 ...GENERIC-RESOURCE-API_self-serve-vnf-assign.json |    3 +-
 ...NERIC-RESOURCE-API_self-serve-generate-name.xml |   30 +-
 ...IC-RESOURCE-API_self-serve-netbox-ip-assign.xml |  738 ++++--
 ...IC-RESOURCE-API_self-serve-vf-module-assign.xml |    2 +-
 7 files changed, 3973 insertions(+), 2852 deletions(-)

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 76a1a697..4c7c450c 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,2902 +1,2936 @@
 [
     {
-        "id": "4715fedb.1ef5f",
+        "id": "9d01f665.242718",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 96,
-        "y": 44,
-        "z": "352ca92a.868d0e",
+        "x": 120,
+        "y": 60,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "16eecbde.63796c"
+                "8d2cd10d.7836b8"
             ]
         ]
     },
     {
-        "id": "16eecbde.63796c",
+        "id": "8d2cd10d.7836b8",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API 1.4.1-SNAPSHOT",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
-        "version": "1.4.1-SNAPSHOT",
+        "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='1.4.1-SNAPSHOT'>",
+        "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": 344.5713806152344,
-        "y": 46.428558349609375,
-        "z": "352ca92a.868d0e",
+        "x": 368.5713806152344,
+        "y": 62.428558349609375,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "3e4b7e7e.935232"
+                "3bb04424.165b2c"
             ]
         ]
     },
     {
-        "id": "3e4b7e7e.935232",
+        "id": "3bb04424.165b2c",
         "type": "method",
         "name": "self-serve-generate-name",
         "xml": "<method rpc='self-serve-generate-name' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 648.1428527832031,
-        "y": 44.99999237060547,
-        "z": "352ca92a.868d0e",
+        "x": 672.1428527832031,
+        "y": 60.99999237060547,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "3835d554.5600ca"
+                "f544f42f.79e4c8"
             ]
         ]
     },
     {
-        "id": "3835d554.5600ca",
+        "id": "f544f42f.79e4c8",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 147.14285278320312,
-        "y": 130.99999237060547,
-        "z": "352ca92a.868d0e",
+        "x": 171.14285278320312,
+        "y": 146.99999237060547,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "cbd7c4ae.654d68",
-                "7bb73832.6a4648",
-                "4b1c4a05.4570ec",
-                "324d6ccc.ba650c",
-                "5c83d412.2769f4"
+                "af15506f.05852",
+                "d5abcd9b.9745b",
+                "9587cb6f.6286",
+                "c8c9dba8.4a219",
+                "c465ea91.13fb38"
             ]
         ]
     },
     {
-        "id": "3a4d4bdb.4c43d4",
+        "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": 1712.8572082519531,
-        "y": 857.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1736.8572082519531,
+        "y": 873.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "cbd7c4ae.654d68",
+        "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": 346.1428527832031,
-        "y": 131.99999237060547,
-        "z": "352ca92a.868d0e",
+        "x": 370.1428527832031,
+        "y": 147.99999237060547,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "7bb73832.6a4648",
+        "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": 375.1428527832031,
-        "y": 223,
-        "z": "352ca92a.868d0e",
+        "x": 399.1428527832031,
+        "y": 239,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "ea0f354c.745cc8",
-                "48698225.83a23c"
+                "7aabee17.1c5ba8",
+                "8a0a976d.bb54a"
             ]
         ]
     },
     {
-        "id": "44cc33ed.fb39e4",
+        "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": 1146.6430053710938,
-        "y": 488.4285125732422,
-        "z": "352ca92a.868d0e",
+        "x": 1170.6430053710938,
+        "y": 504.4285125732422,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "e2d651ce.c9d9f8"
+                "45ec186d.6638d8"
             ]
         ]
     },
     {
-        "id": "e2d651ce.c9d9f8",
+        "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": 1389.5000610351562,
-        "y": 488.4285125732422,
-        "z": "352ca92a.868d0e",
+        "x": 1413.5000610351562,
+        "y": 504.4285125732422,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "8eb45c00.aa654"
+                "c34ee0d3.7925f8"
             ]
         ]
     },
     {
-        "id": "8eb45c00.aa654",
+        "id": "c34ee0d3.7925f8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1570.2144165039062,
-        "y": 488.4284973144531,
-        "z": "352ca92a.868d0e",
+        "x": 1594.2144165039062,
+        "y": 504.4284973144531,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "4c47b1b9.3083"
+                "fbccf37.88f999"
             ]
         ]
     },
     {
-        "id": "83de20b7.804778",
+        "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": 1682.3572082519531,
-        "y": 658.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1706.3572082519531,
+        "y": 674.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "2a82f8ce.16638"
+                "59762169.0b874"
             ]
         ]
     },
     {
-        "id": "ea0f354c.745cc8",
+        "id": "7aabee17.1c5ba8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 598.1428527832031,
-        "y": 191,
-        "z": "352ca92a.868d0e",
+        "x": 622.1428527832031,
+        "y": 207,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "cad21146.cbc7e8"
+                "1370aa99.4464d5"
             ]
         ]
     },
     {
-        "id": "48698225.83a23c",
+        "id": "8a0a976d.bb54a",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 607.1428527832031,
-        "y": 257,
-        "z": "352ca92a.868d0e",
+        "x": 631.1428527832031,
+        "y": 273,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "cad21146.cbc7e8"
+                "1370aa99.4464d5"
             ]
         ]
     },
     {
-        "id": "cad21146.cbc7e8",
+        "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": 800.1428527832031,
-        "y": 191,
-        "z": "352ca92a.868d0e",
+        "x": 824.1428527832031,
+        "y": 207,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "9332f863.29e018",
+        "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": 2284.857208251953,
-        "y": 656.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2308.857208251953,
+        "y": 672.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "26b1ee2d.08273a",
+        "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": 1679.8573608398438,
-        "y": 583.9998626708984,
-        "z": "352ca92a.868d0e",
+        "x": 1703.8573608398438,
+        "y": 599.9998626708984,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "626a201b.d55578",
+        "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": 1679.8572082519531,
-        "y": 720.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1703.8572082519531,
+        "y": 736.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "749d681a.41547",
+        "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": 1685.8572082519531,
-        "y": 785.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1709.8572082519531,
+        "y": 801.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "212189e2.756db6",
+        "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": 1715.8572082519531,
-        "y": 911.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1739.8572082519531,
+        "y": 927.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1ab56a7.feeeb",
+        "id": "97b12709.514e68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2081.857177734375,
-        "y": 933.1427612304688,
-        "z": "352ca92a.868d0e",
+        "x": 2105.857177734375,
+        "y": 949.1427612304688,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9997d3e2.8f70c"
+                "718393eb.a09b34"
             ]
         ]
     },
     {
-        "id": "d0532823.04f01",
+        "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": 2446.857177734375,
-        "y": 1033.1427612304688,
-        "z": "352ca92a.868d0e",
+        "x": 2470.857177734375,
+        "y": 1049.1427612304688,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "7a8d9826.51e62",
+        "id": "d0e601f9.671c6",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2086.857177734375,
-        "y": 1032.1427612304688,
-        "z": "352ca92a.868d0e",
+        "x": 2110.857177734375,
+        "y": 1048.1427612304688,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9997d3e2.8f70c"
+                "718393eb.a09b34"
             ]
         ]
     },
     {
-        "id": "9997d3e2.8f70c",
+        "id": "718393eb.a09b34",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2244.857177734375,
-        "y": 977.1427612304688,
-        "z": "352ca92a.868d0e",
+        "x": 2268.857177734375,
+        "y": 993.1427612304688,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "d17f42c9.165b2",
-                "d0532823.04f01"
+                "bcc4f011.c46088",
+                "f738cd51.cd41e"
             ]
         ]
     },
     {
-        "id": "d17f42c9.165b2",
+        "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": 2460.857177734375,
-        "y": 924.1427612304688,
-        "z": "352ca92a.868d0e",
+        "x": 2484.857177734375,
+        "y": 940.1427612304688,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "2c3347a4.1d0d28",
+        "id": "d674890d.0b54b8",
         "type": "switchNode",
         "name": "switch capability action assign",
         "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 770.3809204101562,
-        "y": 1615.7618560791016,
-        "z": "352ca92a.868d0e",
+        "x": 794.3809204101562,
+        "y": 1631.7618560791016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "be36dff5.5c2408"
+                "20e0c70b.391c68"
             ]
         ]
     },
     {
-        "id": "be36dff5.5c2408",
+        "id": "20e0c70b.391c68",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.0951538085938,
-        "y": 1615.7618560791016,
-        "z": "352ca92a.868d0e",
+        "x": 1049.0951538085938,
+        "y": 1631.7618560791016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "1d187540.6f1cc3"
+                "e6d807c0.e53738"
             ]
         ]
     },
     {
-        "id": "601689b5.f1fb7",
+        "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": 1927.8572082519531,
-        "y": 1213.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1951.8572082519531,
+        "y": 1229.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "c8739969.39695"
+                "c97cd966.464808"
             ]
         ]
     },
     {
-        "id": "a8ca1153.971238",
+        "id": "16707bfd.c97154",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2130.857208251953,
-        "y": 1431.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2154.857208251953,
+        "y": 1447.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "ae4f2855.b375a8"
+                "a824ee12.8cc8e8"
             ]
         ]
     },
     {
-        "id": "ae4f2855.b375a8",
+        "id": "a824ee12.8cc8e8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2340.857208251953,
-        "y": 1431.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2364.857208251953,
+        "y": 1447.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "ab51cd7c.871d7"
+                "c872b3d2.2f9e08"
             ]
         ]
     },
     {
-        "id": "ab51cd7c.871d7",
+        "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": 2537.357208251953,
-        "y": 1432.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2678.0235595703125,
+        "y": 1425.9205322265625,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "280801a6.6b958e",
+        "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": 1696.8572082519531,
-        "y": 1116.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1720.8572082519531,
+        "y": 1132.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1028f45.2b40b",
+        "id": "f2cc0f54.bb60e8",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1689.8572082519531,
-        "y": 1212.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1713.8572082519531,
+        "y": 1228.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "601689b5.f1fb7"
+                "c101db98.1e6f7"
             ]
         ]
     },
     {
-        "id": "c8739969.39695",
+        "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": 2231.857208251953,
-        "y": 1213.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2255.857208251953,
+        "y": 1229.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "e6bfc4cb.d914d"
+                "bad123a5.0894c8"
             ]
         ]
     },
     {
-        "id": "e6bfc4cb.d914d",
+        "id": "bad123a5.0894c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2471.857208251953,
-        "y": 1212.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2495.857208251953,
+        "y": 1228.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "e4b648de.412ed"
+                "be18f58.a0ee008"
             ]
         ]
     },
     {
-        "id": "bc098bd6.7e5e48",
+        "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": 2138.857208251953,
-        "y": 1283.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2162.857208251953,
+        "y": 1299.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a600bc6.51d61c",
+        "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": 2153.857208251953,
-        "y": 1366.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2177.857208251953,
+        "y": 1382.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4b648de.412ed",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1922.8572082519531,
-        "y": 1283.1427688598633,
-        "z": "352ca92a.868d0e",
-        "wires": [
-            [
-                "bc098bd6.7e5e48",
-                "7a600bc6.51d61c",
-                "a8ca1153.971238"
-            ]
-        ]
-    },
-    {
-        "id": "4c47b1b9.3083",
+        "id": "fbccf37.88f999",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1472.8572082519531,
-        "y": 584.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1496.8572082519531,
+        "y": 600.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "26b1ee2d.08273a",
-                "83de20b7.804778",
-                "626a201b.d55578",
-                "749d681a.41547",
-                "3a4d4bdb.4c43d4",
-                "280801a6.6b958e",
-                "d2661b85.b495e",
-                "c1028f45.2b40b",
-                "212189e2.756db6",
-                "cc68ecc2.dbb0c8"
+                "5ed4030d.2a373c",
+                "d539f25c.c0e5b8",
+                "5c5e5f8.5a649a",
+                "30621c93.731054",
+                "8b3cd365.e1b4c",
+                "b9d7571b.298638",
+                "f2cc0f54.bb60e8",
+                "ea2a8ca.3b9d37",
+                "4379c30d.8a80a4"
             ]
         ]
     },
     {
-        "id": "d2661b85.b495e",
-        "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": 1694.8572082519531,
-        "y": 1166.1427688598633,
-        "z": "352ca92a.868d0e",
-        "wires": []
-    },
-    {
-        "id": "e19d4005.611528",
+        "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": 1611.5236206054688,
-        "y": 2100.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1635.5236206054688,
+        "y": 2116.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "52baa22c.b272b4",
+        "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": 1719.0236206054688,
-        "y": 1916.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1743.0236206054688,
+        "y": 1932.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "53c27f81.6966a"
+                "89254dc2.7f4cd8"
             ]
         ]
     },
     {
-        "id": "53c27f81.6966a",
+        "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": 1971.5236206054688,
-        "y": 1916.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1995.5236206054688,
+        "y": 1932.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "168eba65.ac0bfe",
+        "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": 1699.9520874023438,
-        "y": 1855.3808135986328,
-        "z": "352ca92a.868d0e",
+        "x": 1723.9520874023438,
+        "y": 1871.3808135986328,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "3248b7d.b604248",
+        "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": 1701.5236206054688,
-        "y": 1972.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1725.5236206054688,
+        "y": 1988.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "bb4a1d93.3a86c",
+        "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": 1586.5236206054688,
-        "y": 2057.6663360595703,
-        "z": "352ca92a.868d0e",
+        "x": 1610.5236206054688,
+        "y": 2073.6663360595703,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "71c717dc.1a41b",
+        "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": 1612.5236206054688,
-        "y": 2151.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1636.5236206054688,
+        "y": 2167.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "cfb313ac.f6ff68",
+        "id": "88d774fa.1d1a38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1953.523681640625,
-        "y": 2185.66650390625,
-        "z": "352ca92a.868d0e",
+        "x": 1977.523681640625,
+        "y": 2201.66650390625,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "99ddd056.c45ef8"
+                "c5c5c44f.80e79"
             ]
         ]
     },
     {
-        "id": "4ea93843.2ee25",
+        "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": 2318.523681640625,
-        "y": 2285.66650390625,
-        "z": "352ca92a.868d0e",
+        "x": 2342.523681640625,
+        "y": 2301.66650390625,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "48fa407a.74cf2",
+        "id": "157b3125.a0ffff",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1958.523681640625,
-        "y": 2284.66650390625,
-        "z": "352ca92a.868d0e",
+        "x": 1982.523681640625,
+        "y": 2300.66650390625,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "99ddd056.c45ef8"
+                "c5c5c44f.80e79"
             ]
         ]
     },
     {
-        "id": "99ddd056.c45ef8",
+        "id": "c5c5c44f.80e79",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2116.523681640625,
-        "y": 2229.66650390625,
-        "z": "352ca92a.868d0e",
+        "x": 2140.523681640625,
+        "y": 2245.66650390625,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "8d122dd3.f5458",
-                "4ea93843.2ee25"
+                "24a305ec.7924e2",
+                "1dbcec72.a673cc"
             ]
         ]
     },
     {
-        "id": "8d122dd3.f5458",
+        "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": 2332.523681640625,
-        "y": 2176.66650390625,
-        "z": "352ca92a.868d0e",
+        "x": 2356.523681640625,
+        "y": 2192.66650390625,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "9f0b4035.10244",
+        "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": 1832.5236206054688,
-        "y": 2408.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1856.5236206054688,
+        "y": 2424.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "ee35f915.82d68"
+                "d362ce7b.44bc4"
             ]
         ]
     },
     {
-        "id": "1e6b1940.cc1657",
+        "id": "6e2978a6.3a8118",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2035.5236206054688,
-        "y": 2626.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2059.5236206054688,
+        "y": 2642.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9d62a2e2.3a7988"
+                "6be9a784.88ae8"
             ]
         ]
     },
     {
-        "id": "9d62a2e2.3a7988",
+        "id": "6be9a784.88ae8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2245.5236206054688,
-        "y": 2626.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2269.5236206054688,
+        "y": 2642.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "20d781c2.39d966"
+                "88e1aa71.08c4d"
             ]
         ]
     },
     {
-        "id": "20d781c2.39d966",
+        "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": 2442.0236206054688,
-        "y": 2627.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2622.6903076171875,
+        "y": 2611.4442138671875,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "14a8a060.42cee8",
+        "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": 1593.5236206054688,
-        "y": 2310.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1617.5236206054688,
+        "y": 2326.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "1441b20e.14024e",
+        "id": "f671137e.43c9",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.5236206054688,
-        "y": 2407.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1609.5236206054688,
+        "y": 2423.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9f0b4035.10244"
+                "76848f5c.5c31a"
             ]
         ]
     },
     {
-        "id": "ee35f915.82d68",
+        "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": 2136.5236206054688,
-        "y": 2408.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2160.5236206054688,
+        "y": 2424.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "f03c4ce3.3f12"
+                "9fd05568.528db8"
             ]
         ]
     },
     {
-        "id": "f03c4ce3.3f12",
+        "id": "9fd05568.528db8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2376.5236206054688,
-        "y": 2407.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2400.5236206054688,
+        "y": 2423.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "6b8f6d22.f5c394"
+                "70491a0a.6a6a24"
             ]
         ]
     },
     {
-        "id": "8e5f54d5.686b8",
+        "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": 2043.5236206054688,
-        "y": 2478.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2067.5236206054688,
+        "y": 2494.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "46e9ff0c.f30858",
+        "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": 2058.5236206054688,
-        "y": 2561.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2082.5236206054688,
+        "y": 2577.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b8f6d22.f5c394",
+        "id": "70491a0a.6a6a24",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1827.5236206054688,
-        "y": 2478.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1851.5236206054688,
+        "y": 2494.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "8e5f54d5.686b8",
-                "46e9ff0c.f30858",
-                "1e6b1940.cc1657"
+                "925d0988.c8bd58",
+                "3d173098.20141",
+                "6e2978a6.3a8118"
             ]
         ]
     },
     {
-        "id": "a809b004.822848",
+        "id": "94a9278.dd98e58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1496.6666870117188,
-        "y": 1834.9520416259766,
-        "z": "352ca92a.868d0e",
+        "x": 1520.6666870117188,
+        "y": 1850.9520416259766,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "168eba65.ac0bfe",
-                "52baa22c.b272b4",
-                "3248b7d.b604248"
+                "3d749bd0.06285c",
+                "90f9be75.fa811",
+                "3a35a7fe.ef5ea8"
             ]
         ]
     },
     {
-        "id": "cd259e38.191b18",
-        "type": "set",
-        "name": "set status as SUCCESS",
-        "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='SUCCESS' />",
-        "comments": "",
-        "x": 1592.5236206054688,
-        "y": 2361.6663970947266,
-        "z": "352ca92a.868d0e",
-        "wires": []
-    },
-    {
-        "id": "2a82f8ce.16638",
+        "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": 1920.8572082519531,
-        "y": 657.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 1944.8572082519531,
+        "y": 673.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "703d680a.0882b8"
+                "3be873de.5f56e4"
             ]
         ]
     },
     {
-        "id": "703d680a.0882b8",
+        "id": "3be873de.5f56e4",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2104.857208251953,
-        "y": 657.1427688598633,
-        "z": "352ca92a.868d0e",
+        "x": 2128.857208251953,
+        "y": 673.1427688598633,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9332f863.29e018"
+                "c41bbe96.bcfb"
             ]
         ]
     },
     {
-        "id": "e30790a5.8eada8",
+        "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": 1832.4762573242188,
-        "y": 4071.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 1856.4762573242188,
+        "y": 4087.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "764d2bf0.389154",
+        "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": 1120.9761352539062,
-        "y": 3683.3333892822266,
-        "z": "352ca92a.868d0e",
+        "x": 1144.9761352539062,
+        "y": 3699.3333892822266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "3e3dd5d0.a91612"
+                "1a936a5a.dcff5e"
             ]
         ]
     },
     {
-        "id": "3e3dd5d0.a91612",
+        "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": 1400.9761352539062,
-        "y": 3683.3333892822266,
-        "z": "352ca92a.868d0e",
+        "x": 1424.9761352539062,
+        "y": 3699.3333892822266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "50f0868b.978048"
+                "d02ebe6c.238e3"
             ]
         ]
     },
     {
-        "id": "50f0868b.978048",
+        "id": "d02ebe6c.238e3",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1609.9762573242188,
-        "y": 3683.3333892822266,
-        "z": "352ca92a.868d0e",
+        "x": 1633.9762573242188,
+        "y": 3699.3333892822266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "f9767b66.ef7fc8"
+                "17f1cb31.5694ed"
             ]
         ]
     },
     {
-        "id": "69d0476a.820ed8",
+        "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": 1801.9762573242188,
-        "y": 3872.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 1825.9762573242188,
+        "y": 3888.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "a1e78eab.0fa1e8"
+                "206ac6d4.7ae67a"
             ]
         ]
     },
     {
-        "id": "d2c35b36.dd9ed8",
+        "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": 2404.4762573242188,
-        "y": 3870.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 2428.4762573242188,
+        "y": 3886.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "50c2e9.703e9d18",
+        "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": 1799.4762573242188,
-        "y": 3795.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 1823.4762573242188,
+        "y": 3811.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "90bc6a2d.4662e8",
+        "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": 1799.4762573242188,
-        "y": 3934.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 1823.4762573242188,
+        "y": 3950.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "fc28ae3b.ec6fc8",
+        "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": 1805.4762573242188,
-        "y": 3999.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 1829.4762573242188,
+        "y": 4015.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "5413abd2.a41a7c",
+        "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": 1835.4762573242188,
-        "y": 4125.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 1859.4762573242188,
+        "y": 4141.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "3783fc44.dd5b6c",
+        "id": "cb05a44b.81acd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2165.476318359375,
-        "y": 4147.3330078125,
-        "z": "352ca92a.868d0e",
+        "x": 2189.476318359375,
+        "y": 4163.3330078125,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "1c744a01.9209ae"
+                "53f184d5.f04db4"
             ]
         ]
     },
     {
-        "id": "cd050f66.de8e9",
+        "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": 2530.476318359375,
-        "y": 4247.3330078125,
-        "z": "352ca92a.868d0e",
+        "x": 2554.476318359375,
+        "y": 4263.3330078125,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "73945c44.2de044",
+        "id": "ba1d7d79.ebca9",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2170.476318359375,
-        "y": 4246.3330078125,
-        "z": "352ca92a.868d0e",
+        "x": 2194.476318359375,
+        "y": 4262.3330078125,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "1c744a01.9209ae"
+                "53f184d5.f04db4"
             ]
         ]
     },
     {
-        "id": "1c744a01.9209ae",
+        "id": "53f184d5.f04db4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2328.476318359375,
-        "y": 4191.3330078125,
-        "z": "352ca92a.868d0e",
+        "x": 2352.476318359375,
+        "y": 4207.3330078125,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "cb9caa42.183ed",
-                "cd050f66.de8e9"
+                "d5a758ad.0c7368",
+                "ac469966.f9f0b"
             ]
         ]
     },
     {
-        "id": "cb9caa42.183ed",
+        "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": 2544.476318359375,
-        "y": 4138.3330078125,
-        "z": "352ca92a.868d0e",
+        "x": 2568.476318359375,
+        "y": 4154.3330078125,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "afd0ba60.e2d9f",
+        "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": 2047.4762573242188,
-        "y": 4427.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2071.4762573242188,
+        "y": 4443.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "6c40ec43.6ec0dc"
+                "bcafdf43.c97df8"
             ]
         ]
     },
     {
-        "id": "83c9c6e9.87388",
+        "id": "bfa1ad98.e1291",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2250.4762573242188,
-        "y": 4645.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2274.4762573242188,
+        "y": 4661.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "a3d90c5b.ef51f"
+                "1695dfe6.8492a"
             ]
         ]
     },
     {
-        "id": "a3d90c5b.ef51f",
+        "id": "1695dfe6.8492a",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2460.4762573242188,
-        "y": 4645.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2484.4762573242188,
+        "y": 4661.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "b737d55d.af5d1"
+                "29601f42.c65388"
             ]
         ]
     },
     {
-        "id": "b737d55d.af5d1",
+        "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": 2656.9762573242188,
-        "y": 4646.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2680.9762573242188,
+        "y": 4662.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "3d2cb067.b7ddf8",
+        "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": 1816.4762573242188,
-        "y": 4330.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 1840.4762573242188,
+        "y": 4346.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "5411dd84.42d2fc",
+        "id": "dc4b9b10.f541",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1809.4762573242188,
-        "y": 4426.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 1833.4762573242188,
+        "y": 4442.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "afd0ba60.e2d9f"
+                "8566b45.4555748"
             ]
         ]
     },
     {
-        "id": "6c40ec43.6ec0dc",
+        "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": 2351.4762573242188,
-        "y": 4427.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2375.4762573242188,
+        "y": 4443.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "cae9e560.df808"
+                "576f293f.cd5a6"
             ]
         ]
     },
     {
-        "id": "cae9e560.df808",
+        "id": "576f293f.cd5a6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2591.4762573242188,
-        "y": 4426.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2615.4762573242188,
+        "y": 4442.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "a89ce0fc.1e145"
+                "7103d8d3.c872d8"
             ]
         ]
     },
     {
-        "id": "b3a6efba.ab4d7",
+        "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": 2258.4762573242188,
-        "y": 4497.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2282.4762573242188,
+        "y": 4513.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "be3eae60.aeb878",
+        "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": 2273.4762573242188,
-        "y": 4580.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2297.4762573242188,
+        "y": 4596.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "a89ce0fc.1e145",
+        "id": "7103d8d3.c872d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2042.4762573242188,
-        "y": 4497.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 2066.4762573242188,
+        "y": 4513.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "b3a6efba.ab4d7",
-                "be3eae60.aeb878",
-                "83c9c6e9.87388"
+                "3a69492f.bb2bae",
+                "c5cb3ca9.bf8848",
+                "bfa1ad98.e1291"
             ]
         ]
     },
     {
-        "id": "f9767b66.ef7fc8",
+        "id": "17f1cb31.5694ed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1592.4762573242188,
-        "y": 3798.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 1616.4762573242188,
+        "y": 3814.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "50c2e9.703e9d18",
-                "69d0476a.820ed8",
-                "90bc6a2d.4662e8",
-                "fc28ae3b.ec6fc8",
-                "e30790a5.8eada8",
-                "3d2cb067.b7ddf8",
-                "cf08ea1b.928b78",
-                "5411dd84.42d2fc",
-                "5413abd2.a41a7c",
-                "b562a092.868848"
+                "2167bfb4.daf4d",
+                "a4f0128d.13f6b",
+                "b585badd.35b568",
+                "bb4dfba2.da8018",
+                "a56c2f8a.64a94",
+                "e7b4e270.a2e688",
+                "50a18ce1.97fc1c",
+                "dc4b9b10.f541",
+                "73f361ac.bbceb8",
+                "40117641.f32018"
             ]
         ]
     },
     {
-        "id": "cf08ea1b.928b78",
+        "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": 1814.4762573242188,
-        "y": 4380.332901000977,
-        "z": "352ca92a.868d0e",
+        "x": 1838.4762573242188,
+        "y": 4396.332901000977,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "a1e78eab.0fa1e8",
+        "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": 2040.4762573242188,
-        "y": 3871.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 2064.4762573242188,
+        "y": 3887.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "c351bced.05391"
+                "5fae231d.5272ac"
             ]
         ]
     },
     {
-        "id": "c351bced.05391",
+        "id": "5fae231d.5272ac",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2224.4762573242188,
-        "y": 3871.3329010009766,
-        "z": "352ca92a.868d0e",
+        "x": 2248.4762573242188,
+        "y": 3887.3329010009766,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "d2c35b36.dd9ed8"
+                "e421640.8a1ea2"
             ]
         ]
     },
     {
-        "id": "4b1c4a05.4570ec",
+        "id": "9587cb6f.6286",
         "type": "switchNode",
         "name": "switch capability-type. vnf",
         "xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 356.1428527832031,
-        "y": 301.99999237060547,
-        "z": "352ca92a.868d0e",
+        "x": 380.1428527832031,
+        "y": 317.99999237060547,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "812c03eb.24e6a8"
+                "aad954ce.802738"
             ]
         ]
     },
     {
-        "id": "812c03eb.24e6a8",
+        "id": "aad954ce.802738",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 559.5714111328125,
-        "y": 301.2857208251953,
-        "z": "352ca92a.868d0e",
+        "x": 583.5714111328125,
+        "y": 317.2857208251953,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "32866df4.63e6ea"
+                "d4962dde.7144a8"
             ]
         ]
     },
     {
-        "id": "324d6ccc.ba650c",
+        "id": "c8c9dba8.4a219",
         "type": "switchNode",
         "name": "switch capability-type vf-module",
         "xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 485.4761962890625,
-        "y": 3465.3333282470703,
-        "z": "352ca92a.868d0e",
+        "x": 509.4761962890625,
+        "y": 3481.3333282470703,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "ac3b4f92.a95c5"
+                "8771ea99.a3f9d"
             ]
         ]
     },
     {
-        "id": "ac3b4f92.a95c5",
+        "id": "8771ea99.a3f9d",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 704.4761962890625,
-        "y": 3466.3333892822266,
-        "z": "352ca92a.868d0e",
+        "x": 728.4761962890625,
+        "y": 3482.3333892822266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "e2804051.7cbab"
+                "52b0c642.e848e8"
             ]
         ]
     },
     {
-        "id": "70bd05a3.857634",
+        "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": 1597.5236206054688,
-        "y": 2587.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1621.5236206054688,
+        "y": 2603.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "962e71b2.6cdc38"
+                "442eaa12.f66c1c"
             ]
         ]
     },
     {
-        "id": "962e71b2.6cdc38",
+        "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": 1723.1902465820312,
-        "y": 2718.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 1747.1902465820312,
+        "y": 2734.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "7337023b.2c5cac"
+                "b6eb4a26.4fec"
             ]
         ]
     },
     {
-        "id": "7337023b.2c5cac",
+        "id": "b6eb4a26.4fec",
         "type": "failure",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1985.1902465820312,
-        "y": 2774.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2009.1902465820312,
+        "y": 2790.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "351fff6a.5eb578"
+                "67977d8b.c5df04"
             ]
         ]
     },
     {
-        "id": "351fff6a.5eb578",
+        "id": "67977d8b.c5df04",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2201.1902465820312,
-        "y": 2774.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2225.1902465820312,
+        "y": 2790.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "db60e930.c4136",
-                "e87c4b29.75482"
+                "829756fc.3cfc5",
+                "5eef2fa5.addbc8"
             ]
         ]
     },
     {
-        "id": "db60e930.c4136",
+        "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": 2421.1902465820312,
-        "y": 2712.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2451.8568115234375,
+        "y": 2766.4444580078125,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "e87c4b29.75482",
+        "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": 2431.1902465820312,
-        "y": 2820.6663970947266,
-        "z": "352ca92a.868d0e",
+        "x": 2455.1902465820312,
+        "y": 2836.6663970947266,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "767ed8a1.4a0fd",
+        "id": "1fbc0bf7.d9d60c",
         "type": "switchNode",
         "name": "switch capability action unassign",
         "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 813.7142333984375,
-        "y": 392.1428680419922,
-        "z": "352ca92a.868d0e",
+        "x": 837.7142333984375,
+        "y": 408.1428680419922,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "d918681a.83f4a"
+                "efd6575c.f07d5"
             ]
         ]
     },
     {
-        "id": "d918681a.83f4a",
+        "id": "efd6575c.f07d5",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1099.4285278320312,
-        "y": 390.7142791748047,
-        "z": "352ca92a.868d0e",
+        "x": 1123.4285278320312,
+        "y": 406.7142791748047,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "44cc33ed.fb39e4"
+                "57f8f575.c14294"
             ]
         ]
     },
     {
-        "id": "32866df4.63e6ea",
+        "id": "d4962dde.7144a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 563.7142944335938,
-        "y": 366.42860412597656,
-        "z": "352ca92a.868d0e",
+        "x": 587.7142944335938,
+        "y": 382.42860412597656,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "767ed8a1.4a0fd",
-                "2c3347a4.1d0d28"
+                "1fbc0bf7.d9d60c",
+                "d674890d.0b54b8"
             ]
         ]
     },
     {
-        "id": "28134cd4.8102bc",
+        "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": 1038.0715942382812,
-        "y": 1778.166763305664,
-        "z": "352ca92a.868d0e",
+        "x": 1062.0715942382812,
+        "y": 1794.166763305664,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "ea821c0d.f138f"
+                "30d24fbb.704358"
             ]
         ]
     },
     {
-        "id": "ea821c0d.f138f",
+        "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": 1279.6786499023438,
-        "y": 1778.166763305664,
-        "z": "352ca92a.868d0e",
+        "x": 1303.6786499023438,
+        "y": 1794.166763305664,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "5fdd4f70.822d6"
+                "a88e7b27.acd89"
             ]
         ]
     },
     {
-        "id": "5fdd4f70.822d6",
+        "id": "a88e7b27.acd89",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1460.3930053710938,
-        "y": 1778.166763305664,
-        "z": "352ca92a.868d0e",
+        "x": 1484.3930053710938,
+        "y": 1794.166763305664,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "a809b004.822848"
+                "94a9278.dd98e58"
             ]
         ]
     },
     {
-        "id": "6a2168f8.52087",
+        "id": "1954307b.1b2ba8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1192.8572387695312,
-        "y": 3594.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 1216.8572387695312,
+        "y": 3610.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "764d2bf0.389154"
+                "75bd0dd1.6885f4"
             ]
         ]
     },
     {
-        "id": "c27c9e8f.dedd2",
+        "id": "dcef770e.c6ccf8",
         "type": "switchNode",
         "name": "switch capability action unassign",
         "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 951.8569946289062,
-        "y": 3594.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 975.8569946289062,
+        "y": 3610.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "6a2168f8.52087"
+                "1954307b.1b2ba8"
             ]
         ]
     },
     {
-        "id": "e2804051.7cbab",
+        "id": "52b0c642.e848e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 708.8571166992188,
-        "y": 3531.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 732.8571166992188,
+        "y": 3547.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "c27c9e8f.dedd2",
-                "d8487376.9bcfd"
+                "dcef770e.c6ccf8",
+                "ef3aabef.23d1a8"
             ]
         ]
     },
     {
-        "id": "d8487376.9bcfd",
+        "id": "ef3aabef.23d1a8",
         "type": "switchNode",
         "name": "switch capability action assign",
         "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 928.8096313476562,
-        "y": 5202.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 952.8096313476562,
+        "y": 5218.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9fcd1d47.5645c8"
+                "83323826.8871c8"
             ]
         ]
     },
     {
-        "id": "9fcd1d47.5645c8",
+        "id": "83323826.8871c8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1157.8096313476562,
-        "y": 5202.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 1181.8096313476562,
+        "y": 5218.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9cfc91ea.726d38"
+                "b2d3cc7b.89669"
             ]
         ]
     },
     {
-        "id": "920d5892.fd6d68",
+        "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": 1706.3095092773438,
-        "y": 5672.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1730.3095092773438,
+        "y": 5688.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f85a78f.b9dd4",
+        "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": 2024.5595092773438,
-        "y": 5480.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 2048.5595092773438,
+        "y": 5496.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "172c4c1f.fc374c"
+                "9ebe174c.cca8f8"
             ]
         ]
     },
     {
-        "id": "172c4c1f.fc374c",
+        "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": 2281.0595092773438,
-        "y": 5480.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 2305.0595092773438,
+        "y": 5496.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "f9d872c.140039",
+        "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": 2007.0595092773438,
-        "y": 5426.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 2031.0595092773438,
+        "y": 5442.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "63be973.1d659e8",
+        "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": 2013.0595092773438,
-        "y": 5542.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 2037.0595092773438,
+        "y": 5558.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "9191c58b.b355c8",
+        "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": 1676.3095092773438,
-        "y": 5621.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1700.3095092773438,
+        "y": 5637.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "f18ac492.ee4eb",
+        "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": 1709.3095092773438,
-        "y": 5726.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1733.3095092773438,
+        "y": 5742.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "965c8b30.02d398",
+        "id": "7e5bd1ab.209ca",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2012.3095703125,
-        "y": 5740.58447265625,
-        "z": "352ca92a.868d0e",
+        "x": 2036.3095703125,
+        "y": 5756.58447265625,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "f4e23bde.24eef"
+                "42fc5b6c.345bdc"
             ]
         ]
     },
     {
-        "id": "180b7df9.28995a",
+        "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": 2377.3095703125,
-        "y": 5840.58447265625,
-        "z": "352ca92a.868d0e",
+        "x": 2401.3095703125,
+        "y": 5856.58447265625,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "1877c29b.11c2e5",
+        "id": "90a92735.264c5",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2017.3095703125,
-        "y": 5839.58447265625,
-        "z": "352ca92a.868d0e",
+        "x": 2041.3095703125,
+        "y": 5855.58447265625,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "f4e23bde.24eef"
+                "42fc5b6c.345bdc"
             ]
         ]
     },
     {
-        "id": "f4e23bde.24eef",
+        "id": "42fc5b6c.345bdc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2175.3095703125,
-        "y": 5784.58447265625,
-        "z": "352ca92a.868d0e",
+        "x": 2199.3095703125,
+        "y": 5800.58447265625,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "180b7df9.28995a",
-                "88545db3.91b2f8"
+                "1e009a1e.612266",
+                "91ff7811.5db32"
             ]
         ]
     },
     {
-        "id": "88545db3.91b2f8",
+        "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": 2391.3095703125,
-        "y": 5731.58447265625,
-        "z": "352ca92a.868d0e",
+        "x": 2415.3095703125,
+        "y": 5747.58447265625,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "787fb15a.391898",
+        "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": 1987.3095092773438,
-        "y": 6316.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2011.3095092773438,
+        "y": 6332.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "5f3830ae.3b7538"
+                "df02f986.45d718"
             ]
         ]
     },
     {
-        "id": "854fee6.3fdc71",
+        "id": "1035d4b9.e79303",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2158.3095092773438,
-        "y": 6474.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2182.3095092773438,
+        "y": 6490.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "c27fc49d.c8374"
+                "d32665c0.ffe428"
             ]
         ]
     },
     {
-        "id": "c27fc49d.c8374",
+        "id": "d32665c0.ffe428",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2362.3095092773438,
-        "y": 6472.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2386.3095092773438,
+        "y": 6488.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "49f045b5.0d39c4"
+                "24aa734a.87d674"
             ]
         ]
     },
     {
-        "id": "49f045b5.0d39c4",
+        "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": 2556.8095092773438,
-        "y": 6405.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2580.8095092773438,
+        "y": 6421.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "b37ecff9.03eaa8",
+        "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": 1690.3095092773438,
-        "y": 5839.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1714.3095092773438,
+        "y": 5855.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "f5c7340.140185",
+        "id": "c7bfb325.ec2d98",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1719.3095092773438,
-        "y": 6317.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1743.3095092773438,
+        "y": 6333.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "787fb15a.391898"
+                "9626c789.309858"
             ]
         ]
     },
     {
-        "id": "5f3830ae.3b7538",
+        "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": 2271.3095092773438,
-        "y": 6320.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2295.3095092773438,
+        "y": 6336.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "6e6d2e55.ed356"
+                "c66b75af.b35668"
             ]
         ]
     },
     {
-        "id": "6e6d2e55.ed356",
+        "id": "c66b75af.b35668",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2499.3095092773438,
-        "y": 6317.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2523.3095092773438,
+        "y": 6333.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "177cba1.8a3a046"
+                "a8f90ed5.c9b5a8"
             ]
         ]
     },
     {
-        "id": "76939575.7aa904",
+        "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": 2166.3095092773438,
-        "y": 6370.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2190.3095092773438,
+        "y": 6386.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "bd832c6d.e0325",
+        "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": 2179.3095092773438,
-        "y": 6429.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2203.3095092773438,
+        "y": 6445.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "177cba1.8a3a046",
+        "id": "a8f90ed5.c9b5a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1926.3095092773438,
-        "y": 6396.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1950.3095092773438,
+        "y": 6412.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "854fee6.3fdc71",
-                "76939575.7aa904",
-                "bd832c6d.e0325"
+                "1035d4b9.e79303",
+                "a4a7fab0.32e9b8",
+                "b57bbec9.12ea6"
             ]
         ]
     },
     {
-        "id": "e20ed5c.32f5da8",
+        "id": "9c309af6.f7e4a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1800.0595092773438,
-        "y": 5429.334121704102,
-        "z": "352ca92a.868d0e",
+        "x": 1824.0595092773438,
+        "y": 5445.334121704102,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "4f85a78f.b9dd4",
-                "f9d872c.140039",
-                "63be973.1d659e8"
+                "e105813.22ffe8",
+                "89efd59e.cf284",
+                "4f8d850b.bbbc44"
             ]
         ]
     },
     {
-        "id": "5e93d51f.0cdb84",
+        "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": 1692.3095092773438,
-        "y": 5891.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1716.3095092773438,
+        "y": 5907.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "dfa3d386.e26368",
+        "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": 1714.3095092773438,
-        "y": 6539.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1738.3095092773438,
+        "y": 6555.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "f3d23ebf.0d11b"
+                "8fcead9b.0e0b8"
             ]
         ]
     },
     {
-        "id": "f3d23ebf.0d11b",
+        "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": 2020.3095092773438,
-        "y": 6537.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2044.3095092773438,
+        "y": 6553.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "4788805e.3ba1d8"
+                "f158d276.0d8658"
             ]
         ]
     },
     {
-        "id": "4788805e.3ba1d8",
+        "id": "f158d276.0d8658",
         "type": "failure",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2258.3095092773438,
-        "y": 6537.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2282.3095092773438,
+        "y": 6553.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "33994871.8869b8"
+                "3621a169.1458b6"
             ]
         ]
     },
     {
-        "id": "33994871.8869b8",
+        "id": "3621a169.1458b6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2420.3095092773438,
-        "y": 6531.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2444.3095092773438,
+        "y": 6547.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "b85bda2d.9d095",
-                "bd0032a6.185cd8"
+                "fef37cdf.87178",
+                "157e032d.744875"
             ]
         ]
     },
     {
-        "id": "b85bda2d.9d095",
+        "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": 2644.3095092773438,
-        "y": 6497.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2668.3095092773438,
+        "y": 6513.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "bd0032a6.185cd8",
+        "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": 2632.3095092773438,
-        "y": 6597.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2656.3095092773438,
+        "y": 6613.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "5d27e69c.99355",
+        "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": 1702.3095092773438,
-        "y": 5997.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 1726.3095092773438,
+        "y": 6013.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "d4c9fe83.84aac8"
+                "e7e744c9.85b75"
             ]
         ]
     },
     {
-        "id": "d4c9fe83.84aac8",
+        "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": 1955.8095092773438,
-        "y": 5998.584854125977,
-        "z": "352ca92a.868d0e",
+        "x": 1979.8095092773438,
+        "y": 6014.584854125977,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "c85b8b2c.2fc05"
+                "2a4c76d1.47e9a2"
             ]
         ]
     },
     {
-        "id": "c85b8b2c.2fc05",
+        "id": "2a4c76d1.47e9a2",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2148.8095092773438,
-        "y": 5999.084732055664,
-        "z": "352ca92a.868d0e",
+        "x": 2172.8095092773438,
+        "y": 6015.084732055664,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "1dc11508.39f67b"
+                "2c6b125a.5ec166"
             ]
         ]
     },
     {
-        "id": "1dc11508.39f67b",
+        "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": 1796.0238647460938,
-        "y": 6107.870666503906,
-        "z": "352ca92a.868d0e",
+        "x": 1820.0238647460938,
+        "y": 6123.870666503906,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "fdb568af.3349a8"
+                "eb80eaa0.5a981"
             ]
         ]
     },
     {
-        "id": "fdb568af.3349a8",
+        "id": "eb80eaa0.5a981",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2066.5953369140625,
-        "y": 6109.584655761719,
-        "z": "352ca92a.868d0e",
+        "x": 2090.5953369140625,
+        "y": 6125.584655761719,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "c7c8f5c5.e7ace8",
-                "5b56627b.8b263c",
-                "8553a1d9.e2d5a8",
-                "e7c811b5.eee95",
-                "52a023ea.e09d54",
-                "bf45f76d.ed3c68",
-                "ea657b65.61ab28"
+                "e4d68431.8d96a8",
+                "ecab974a.9bbd78",
+                "314dd1f2.f106d6",
+                "435ecba0.88a2c4",
+                "18703684.a36359",
+                "5a418843.fb8ce",
+                "658b4432.deae1c"
             ]
         ]
     },
     {
-        "id": "5b56627b.8b263c",
+        "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": 2500.3095092773438,
-        "y": 5985.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2524.3095092773438,
+        "y": 6001.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "a1c68f19.01d038"
+                "cf5cb0c4.d1ede8"
             ]
         ]
     },
     {
-        "id": "8553a1d9.e2d5a8",
+        "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": 2468.3095092773438,
-        "y": 6043.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2492.3095092773438,
+        "y": 6059.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "62bb6ad6.a53de4"
+                "70feaf3a.73ab2"
             ]
         ]
     },
     {
-        "id": "e7c811b5.eee95",
+        "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": 2466.3095092773438,
-        "y": 6105.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2490.3095092773438,
+        "y": 6121.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "3d8cad4d.93e9ea"
+                "40b980ec.ac6338"
             ]
         ]
     },
     {
-        "id": "52a023ea.e09d54",
+        "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": 2474.3095092773438,
-        "y": 6167.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2498.3095092773438,
+        "y": 6183.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "82c20f3a.6eaf3"
+                "3405bb1d.191ce4"
             ]
         ]
     },
     {
-        "id": "c7c8f5c5.e7ace8",
+        "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": 2490.3095092773438,
-        "y": 5913.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2514.3095092773438,
+        "y": 5929.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "6f52d21a.388114"
+                "8cbeeb62.d5961"
             ]
         ]
     },
     {
-        "id": "6f52d21a.388114",
+        "id": "8cbeeb62.d5961",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.3095092773438,
-        "y": 5909.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2718.3095092773438,
+        "y": 5925.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9fa0d09b.7817b"
+                "57750a1a.165544"
             ]
         ]
     },
     {
-        "id": "a1c68f19.01d038",
+        "id": "cf5cb0c4.d1ede8",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.3095092773438,
-        "y": 5983.834487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2718.3095092773438,
+        "y": 5999.834487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "437a342d.168b3c"
+                "57206663.d5c56"
             ]
         ]
     },
     {
-        "id": "62bb6ad6.a53de4",
+        "id": "70feaf3a.73ab2",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2700.3095092773438,
-        "y": 6039.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2724.3095092773438,
+        "y": 6055.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "50785314.d70f24"
+                "b4b44bc3.5bb8a8"
             ]
         ]
     },
     {
-        "id": "3d8cad4d.93e9ea",
+        "id": "40b980ec.ac6338",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2704.3095092773438,
-        "y": 6097.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2728.3095092773438,
+        "y": 6113.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "5705e23b.a1cf84"
+                "8cc0d8fe.d3593"
             ]
         ]
     },
     {
-        "id": "82c20f3a.6eaf3",
+        "id": "3405bb1d.191ce4",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2710.3095092773438,
-        "y": 6163.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2734.3095092773438,
+        "y": 6179.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "90e5277b.fe7688"
+                "f57a9876.705b68"
             ]
         ]
     },
     {
-        "id": "9fa0d09b.7817b",
+        "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": 2858.3095092773438,
-        "y": 5911.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2882.3095092773438,
+        "y": 5927.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "437a342d.168b3c",
+        "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": 2904.3095092773438,
-        "y": 5977.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2928.3095092773438,
+        "y": 5993.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "50785314.d70f24",
+        "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": 2948.3095092773438,
-        "y": 6041.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2972.3095092773438,
+        "y": 6057.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "5705e23b.a1cf84",
+        "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": 2924.3095092773438,
-        "y": 6095.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2948.3095092773438,
+        "y": 6111.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "90e5277b.fe7688",
+        "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": 2870.3095092773438,
-        "y": 6161.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2894.3095092773438,
+        "y": 6177.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "3eb0fb20.3c8784",
+        "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": 2876.3095092773438,
-        "y": 6217.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2900.3095092773438,
+        "y": 6233.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "7aa119bc.c8649",
+        "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": 2894.3095092773438,
-        "y": 6273.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2918.3095092773438,
+        "y": 6289.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "bf45f76d.ed3c68",
+        "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": 2474.3095092773438,
-        "y": 6219.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2498.3095092773438,
+        "y": 6235.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "543b01b7.f299f8"
+                "2b96a377.785aec"
             ]
         ]
     },
     {
-        "id": "ea657b65.61ab28",
+        "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": 2472.3095092773438,
-        "y": 6273.584487915039,
-        "z": "352ca92a.868d0e",
+        "x": 2496.3095092773438,
+        "y": 6289.584487915039,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "bdbf1963.90f8d"
+                "2a2a4a91.63c3f6"
             ]
         ]
     },
     {
-        "id": "543b01b7.f299f8",
+        "id": "2b96a377.785aec",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2708.3095092773438,
-        "y": 6217.584487915038,
-        "z": "352ca92a.868d0e",
+        "x": 2732.3095092773438,
+        "y": 6233.584487915038,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "3eb0fb20.3c8784"
+                "ec4b72ee.0d91e8"
             ]
         ]
     },
     {
-        "id": "bdbf1963.90f8d",
+        "id": "2a2a4a91.63c3f6",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2702.3095092773438,
-        "y": 6271.584487915038,
-        "z": "352ca92a.868d0e",
+        "x": 2726.3095092773438,
+        "y": 6287.584487915038,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "7aa119bc.c8649"
+                "c2128119.3c59c8"
             ]
         ]
     },
     {
-        "id": "3c8588b.9d7d378",
+        "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": 1242.8571166992188,
-        "y": 5375.571670532227,
-        "z": "352ca92a.868d0e",
+        "x": 1266.8571166992188,
+        "y": 5391.571670532227,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "7a0efead.43ce28"
+                "bd4ce803.509a98"
             ]
         ]
     },
     {
-        "id": "7a0efead.43ce28",
+        "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": 1522.8571166992188,
-        "y": 5375.571670532227,
-        "z": "352ca92a.868d0e",
+        "x": 1546.8571166992188,
+        "y": 5391.571670532227,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "31adf68d.f27ac2"
+                "a5d1018e.3683e"
             ]
         ]
     },
     {
-        "id": "31adf68d.f27ac2",
+        "id": "a5d1018e.3683e",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.8572387695312,
-        "y": 5375.571670532227,
-        "z": "352ca92a.868d0e",
+        "x": 1755.8572387695312,
+        "y": 5391.571670532227,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "e20ed5c.32f5da8"
+                "9c309af6.f7e4a"
             ]
         ]
     },
     {
-        "id": "1d187540.6f1cc3",
+        "id": "e6d807c0.e53738",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 817.1071166992188,
-        "y": 1718.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 841.1071166992188,
+        "y": 1734.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "28134cd4.8102bc",
-                "b3cbf23b.ff3db8",
-                "39c643cc.a6f784"
+                "177385a3.c043a2",
+                "ff615e80.275a08",
+                "39178dc5.011a9a"
             ]
         ]
     },
     {
-        "id": "b3cbf23b.ff3db8",
+        "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": 1024.8571166992188,
-        "y": 1719.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 1048.8571166992188,
+        "y": 1735.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "39c643cc.a6f784",
+        "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": 1072.8571166992188,
-        "y": 1998.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 1096.8571166992188,
+        "y": 2014.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "6afda891.090ee8"
+                "781da2e9.01d83c"
             ]
         ]
     },
     {
-        "id": "6afda891.090ee8",
+        "id": "781da2e9.01d83c",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1309.8571166992188,
-        "y": 1999.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 1333.8571166992188,
+        "y": 2015.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "5dc815b0.cc07ec"
+                "600486cd.2b6308"
             ]
         ]
     },
     {
-        "id": "5dc815b0.cc07ec",
+        "id": "600486cd.2b6308",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1347.8571166992188,
-        "y": 2057.5714263916016,
-        "z": "352ca92a.868d0e",
+        "x": 1371.8571166992188,
+        "y": 2073.5714263916016,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "bb4a1d93.3a86c",
-                "e19d4005.611528",
-                "71c717dc.1a41b",
-                "14a8a060.42cee8",
-                "cd259e38.191b18",
-                "1441b20e.14024e",
-                "70bd05a3.857634",
-                "a1fb5091.45b8b8"
+                "85561c80.3ef308",
+                "ef4a1fc.34c336",
+                "4c175841.300a1",
+                "333a840.1d25d7c",
+                "f671137e.43c9",
+                "99f26ef3.280eb",
+                "80fef6f4.c675b"
             ]
         ]
     },
     {
-        "id": "9cfc91ea.726d38",
+        "id": "b2d3cc7b.89669",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 993.8571166992188,
-        "y": 5308.571426391602,
-        "z": "352ca92a.868d0e",
+        "x": 1017.8571166992188,
+        "y": 5324.571426391602,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "19501c77.860e0c",
-                "3c8588b.9d7d378",
-                "77587c38.f5170c"
+                "6a40e563.5a14a4",
+                "b9630ea3.d96b18",
+                "7640b347.b23714"
             ]
         ]
     },
     {
-        "id": "19501c77.860e0c",
+        "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": 1230.8571166992188,
-        "y": 5307.571426391602,
-        "z": "352ca92a.868d0e",
+        "x": 1254.8571166992188,
+        "y": 5323.571426391602,
+        "z": "8ffa18ff.21a748",
         "wires": []
     },
     {
-        "id": "77587c38.f5170c",
+        "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": 1273.1071472167969,
-        "y": 5498.071548461914,
-        "z": "352ca92a.868d0e",
+        "x": 1297.1071472167969,
+        "y": 5514.071548461914,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "212b3074.a654f"
+                "48235ce0.3408cc"
             ]
         ]
     },
     {
-        "id": "212b3074.a654f",
+        "id": "48235ce0.3408cc",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1506.857177734375,
-        "y": 5497.821304321289,
-        "z": "352ca92a.868d0e",
+        "x": 1530.857177734375,
+        "y": 5513.821304321289,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "4671f4c1.916ba4"
+                "7c76786f.4904"
             ]
         ]
     },
     {
-        "id": "4671f4c1.916ba4",
+        "id": "7c76786f.4904",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1494.607177734375,
-        "y": 5575.071670532227,
-        "z": "352ca92a.868d0e",
+        "x": 1518.607177734375,
+        "y": 5591.071670532227,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "9191c58b.b355c8",
-                "920d5892.fd6d68",
-                "f18ac492.ee4eb",
-                "b37ecff9.03eaa8",
-                "5e93d51f.0cdb84",
-                "5d27e69c.99355",
-                "f5c7340.140185",
-                "dfa3d386.e26368",
-                "f6148def.164458"
+                "98c04a64.a011c",
+                "9f73d864.8536d8",
+                "d2f1471f.d735d",
+                "b6489347.bb4308",
+                "3caf0f0c.12a5b8",
+                "8a66938a.1460b",
+                "c7bfb325.ec2d98",
+                "267d42ee.73dbde",
+                "90b8bf99.7de998"
             ]
         ]
     },
     {
-        "id": "5c83d412.2769f4",
+        "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": 359,
-        "y": 177,
-        "z": "352ca92a.868d0e",
+        "x": 383,
+        "y": 193,
+        "z": "8ffa18ff.21a748",
         "wires": [
             []
         ]
     },
     {
-        "id": "f6148def.164458",
+        "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": 1755,
-        "y": 5788,
-        "z": "352ca92a.868d0e",
+        "x": 1779,
+        "y": 5804,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "965c8b30.02d398",
-                "1877c29b.11c2e5"
+                "7e5bd1ab.209ca",
+                "90a92735.264c5"
             ]
         ]
     },
     {
-        "id": "a1fb5091.45b8b8",
+        "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": 1658,
-        "y": 2230,
-        "z": "352ca92a.868d0e",
+        "x": 1682,
+        "y": 2246,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "cfb313ac.f6ff68",
-                "48fa407a.74cf2"
+                "88d774fa.1d1a38",
+                "157b3125.a0ffff"
             ]
         ]
     },
     {
-        "id": "b562a092.868848",
+        "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": 1875,
-        "y": 4195,
-        "z": "352ca92a.868d0e",
+        "x": 1899,
+        "y": 4211,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "3783fc44.dd5b6c",
-                "73945c44.2de044"
+                "cb05a44b.81acd",
+                "ba1d7d79.ebca9"
             ]
         ]
     },
     {
-        "id": "cc68ecc2.dbb0c8",
+        "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": 1768,
-        "y": 980,
-        "z": "352ca92a.868d0e",
+        "x": 1792,
+        "y": 996,
+        "z": "8ffa18ff.21a748",
         "wires": [
             [
-                "e1ab56a7.feeeb",
-                "7a8d9826.51e62"
+                "97b12709.514e68",
+                "d0e601f9.671c6"
             ]
         ]
     },
     {
-        "id": "5e135e40.b1de4",
+        "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": 822,
-        "y": 107,
-        "z": "352ca92a.868d0e",
+        "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"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
index 3a86e268..9fb1c8eb 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
@@ -1,973 +1,1785 @@
 [
     {
-        "id": "aeddcb92.bde6a",
+        "id": "77c2b18.8d31ed",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 97,
-        "y": 62.57143306732178,
-        "z": "6621aeef.bf45",
+        "x": 112,
+        "y": 53.57143306732178,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "460b7122.4f837"
+                "9dcfa1bf.c57ff"
             ]
         ]
     },
     {
-        "id": "295d429e.f0a67e",
+        "id": "f8a5c87f.00d498",
         "type": "method",
         "name": "method self-serve-netbox-ip-assign",
         "xml": "<method rpc='self-serve-netbox-ip-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 232.7857208251953,
-        "y": 119.69842147827148,
-        "z": "6621aeef.bf45",
+        "x": 247.7857208251953,
+        "y": 110.69842147827148,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "bea678c6.71dd7"
+                "547eae19.add57"
             ]
         ]
     },
     {
-        "id": "bea678c6.71dd7",
+        "id": "547eae19.add57",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 126.32144165039062,
-        "y": 206.0000400543213,
-        "z": "6621aeef.bf45",
+        "x": 141.32144165039062,
+        "y": 197.0000400543213,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "d5200d6.b499a7",
-                "dfe3495f.0a6cf8",
-                "bb3b73.97d8649",
-                "c356df77.cc7c28",
-                "f691073d.b6c728"
+                "74f4f85d.362368",
+                "511e7db4.d38c5c",
+                "1c580da3.ca9442",
+                "9b5b9dd.e182f6",
+                "727a4c78.25da9c"
             ]
         ]
     },
     {
-        "id": "460b7122.4f837",
+        "id": "9dcfa1bf.c57ff",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API 1.4.1-SNAPSHOT",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
-        "version": "1.4.1-SNAPSHOT",
+        "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='1.4.1-SNAPSHOT'>",
+        "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": 369.8571472167969,
-        "y": 62,
-        "z": "6621aeef.bf45",
+        "x": 384.8571472167969,
+        "y": 53,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "295d429e.f0a67e"
+                "f8a5c87f.00d498"
             ]
         ]
     },
     {
-        "id": "d5200d6.b499a7",
+        "id": "74f4f85d.362368",
         "type": "switchNode",
         "name": "switch: ss.capability-name",
         "xml": "<switch test='`$ss.capability-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 384.4999694824219,
-        "y": 209.82144165039062,
-        "z": "6621aeef.bf45",
+        "x": 399.4999694824219,
+        "y": 200.82144165039062,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "16de1328.9e165d"
+                "b9e21b14.67ef6"
             ]
         ]
     },
     {
-        "id": "16de1328.9e165d",
+        "id": "b9e21b14.67ef6",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "outputs": 1,
-        "x": 609.4999923706055,
-        "y": 210.32144021987915,
-        "z": "6621aeef.bf45",
+        "x": 624.4999923706055,
+        "y": 201.32144021987915,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "72fded58.33f2a4"
+                "73fe504e.4705c"
             ]
         ]
     },
     {
-        "id": "72fded58.33f2a4",
+        "id": "73fe504e.4705c",
         "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\t<parameter name=\"error-message\" value=\"ss.capability-name is null\" />\n",
         "comments": "",
-        "x": 769.4166641235352,
-        "y": 210.43253898620605,
-        "z": "6621aeef.bf45",
+        "x": 784.4166641235352,
+        "y": 201.43253898620605,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "dfe3495f.0a6cf8",
+        "id": "511e7db4.d38c5c",
         "type": "switchNode",
         "name": "switch: ss.capability-action",
         "xml": "<switch test='`$ss.capability-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 387.74996185302734,
-        "y": 285.82143688201904,
-        "z": "6621aeef.bf45",
+        "x": 402.74996185302734,
+        "y": 276.82143688201904,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "a5187f.af9a5f8"
+                "44dc8d7e.430a74"
             ]
         ]
     },
     {
-        "id": "a5187f.af9a5f8",
+        "id": "44dc8d7e.430a74",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 611.2499618530273,
-        "y": 286.07143688201904,
-        "z": "6621aeef.bf45",
+        "x": 626.2499618530273,
+        "y": 277.07143688201904,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "70603bf9.fc52ac"
+                "1a43de2d.0a450a"
             ]
         ]
     },
     {
-        "id": "70603bf9.fc52ac",
+        "id": "1a43de2d.0a450a",
         "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\t<parameter name=\"error-message\" value=\"ss.capability-action is null\" />\n",
         "comments": "",
-        "x": 771.166633605957,
-        "y": 286.18253564834595,
-        "z": "6621aeef.bf45",
+        "x": 786.166633605957,
+        "y": 277.18253564834595,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "2ff7ecc5.284a3c",
+        "id": "19870db6.43192a",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>",
         "comments": "",
         "outputs": 1,
-        "x": 891.8930053710938,
-        "y": 1566.500039100647,
-        "z": "6621aeef.bf45",
+        "x": 1251.8930969238281,
+        "y": 3041.6666650772095,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "3015a413.8908c4"
+                "d275ec9.837569"
             ]
         ]
     },
     {
-        "id": "c356df77.cc7c28",
+        "id": "1c580da3.ca9442",
         "type": "call",
         "name": "call self-service-capability-param-resolution",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-service-capability-param-resolution' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 438.41680908203125,
-        "y": 360.82147216796875,
-        "z": "6621aeef.bf45",
+        "x": 453.41680908203125,
+        "y": 351.82147216796875,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "260a2383.61ca04"
+                "5d40b27c.221a9c"
             ]
         ]
     },
     {
-        "id": "260a2383.61ca04",
+        "id": "5d40b27c.221a9c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.6667060852051,
-        "y": 362.821475982666,
-        "z": "6621aeef.bf45",
+        "x": 757.6667060852051,
+        "y": 353.821475982666,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "a9e7fd90.1e1948"
+                "edcc63af.4dd9d8"
             ]
         ]
     },
     {
-        "id": "a9e7fd90.1e1948",
+        "id": "edcc63af.4dd9d8",
         "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\t<parameter name=\"error-message\" value=\"`'Not all assignments are resolved' + $error-message`\" />\n",
         "comments": "",
-        "x": 901.4166870117188,
-        "y": 362.82147216796875,
-        "z": "6621aeef.bf45",
+        "x": 916.4166870117188,
+        "y": 353.82147216796875,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "c106c1b3.fa5708",
+        "id": "4f9c6ac7.4bbeac",
         "type": "set",
         "name": "set tmp.ss.param.capability-name",
         "xml": "<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n",
         "comments": "",
-        "x": 901.5634307861328,
-        "y": 418.603187084198,
-        "z": "6621aeef.bf45",
+        "x": 1199.0635833740234,
+        "y": 1963.7697825431824,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "cf602ff2.69d16",
+        "id": "c92d4312.5079b8",
         "type": "for",
         "name": "for pidx in param_length",
         "xml": "<for index=\"pidx\" 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": 611.7776565551758,
-        "y": 418.6746573448181,
-        "z": "6621aeef.bf45",
+        "x": 909.2778091430664,
+        "y": 1963.8412528038025,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "9a404501.e9a9f",
-                "575f86c4.d593b8",
-                "c106c1b3.fa5708"
+                "f2a77014.d729d8",
+                "864fa674.d2c07",
+                "4f9c6ac7.4bbeac"
             ]
         ]
     },
     {
-        "id": "575f86c4.d593b8",
+        "id": "864fa674.d2c07",
         "type": "switchNode",
         "name": "switch: capability-name - ss vs param",
         "xml": "<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 914.6388931274414,
-        "y": 499.95243978500366,
-        "z": "6621aeef.bf45",
+        "x": 1212.139045715332,
+        "y": 2045.119035243988,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "5ffdfe5e.2f2ba8"
+                "27ca1b50.7b7b94"
             ]
         ]
     },
     {
-        "id": "5ffdfe5e.2f2ba8",
+        "id": "27ca1b50.7b7b94",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1153.388900756836,
-        "y": 499.70243978500366,
-        "z": "6621aeef.bf45",
+        "x": 1450.8890533447266,
+        "y": 2044.869035243988,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "5c183d21.694a54"
+                "8094ff69.1f8708"
             ]
         ]
     },
     {
-        "id": "6474a2a3.971edc",
+        "id": "e4dea9e2.e240e8",
         "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[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1340.778221130371,
-        "y": 819.99640417099,
-        "z": "6621aeef.bf45",
+        "x": 1700.7783126831055,
+        "y": 2295.1630301475525,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "eae11399.61a66",
-                "d4df7117.d17f68",
-                "7bb69337.4e6394",
-                "5c5c662c.f08f1",
-                "90dc69e5.6405"
+                "33db91f0.e9f01e",
+                "e6bd6a68.08413",
+                "5e2abf9b.b85b4",
+                "a20a3dc.5fc3fc",
+                "82eaeb00.f8a53"
             ]
         ]
     },
     {
-        "id": "d4df7117.d17f68",
+        "id": "e6bd6a68.08413",
         "type": "outcome",
         "name": "service-instance-id",
         "xml": "<outcome value='service-instance-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1612.1671295166016,
-        "y": 819.4686226844788,
-        "z": "6621aeef.bf45",
+        "x": 1972.167221069336,
+        "y": 2294.6352486610413,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "8300040f.111c68"
+                "ef960f90.e62e4"
             ]
         ]
     },
     {
-        "id": "8300040f.111c68",
+        "id": "ef960f90.e62e4",
         "type": "set",
         "name": "set tmp.ss.service-instance-id",
         "xml": "<set>\n<parameter name='tmp.ss.service-instance-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1878.4171295166016,
-        "y": 819.2186226844788,
-        "z": "6621aeef.bf45",
+        "x": 2238.417221069336,
+        "y": 2294.3852486610413,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "235c0ede.173f92",
+        "id": "b434a262.2a412",
         "type": "set",
         "name": "set service-data...param[].value = ip-address",
-        "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[$pidx].value' \n\tvalue='`$self_serve_netbox_ip_assignement.ip-address`' />\n",
+        "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[$pidx].value' \n\tvalue='`$ip[0]`' />\n",
         "comments": "",
-        "x": 2168.960205078125,
-        "y": 1349.4608764648438,
-        "z": "6621aeef.bf45",
+        "x": 2534.960205078125,
+        "y": 2879.62744140625,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "deee58e3.ecff3",
+        "id": "7e13641e.d9c954",
         "type": "update",
         "name": "get-resource IPAM_IP_ASSIGNEMENT",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from IPAM_IP_ASSIGNEMENT \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id' >",
         "comments": "",
         "outputs": 1,
-        "x": 1367.3770751953125,
-        "y": 1565.3214502334595,
-        "z": "6621aeef.bf45",
+        "x": 1727.3771667480469,
+        "y": 3040.488076210022,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "21ac77e1.c9741",
-                "64c75b78.f36b24"
+                "986620e4.a7ba3",
+                "95406bea.6b1b6"
             ]
         ]
     },
     {
-        "id": "21ac77e1.c9741",
+        "id": "986620e4.a7ba3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1661.964412689209,
-        "y": 1566.321483373642,
-        "z": "6621aeef.bf45",
+        "x": 2021.9645042419434,
+        "y": 3041.4881093502045,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "131e59c0.7aa77e"
+                "d043ccbb.6e195"
             ]
         ]
     },
     {
-        "id": "3015a413.8908c4",
+        "id": "d275ec9.837569",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1061.214370727539,
-        "y": 1566.964394569397,
-        "z": "6621aeef.bf45",
+        "x": 1421.2144622802734,
+        "y": 3042.1310205459595,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "deee58e3.ecff3"
+                "7e13641e.d9c954"
             ]
         ]
     },
     {
-        "id": "f6c6e34.fe93ea",
+        "id": "eabe3654.2861f",
         "type": "for",
         "name": "for kidx in resource-key_length",
         "xml": "<for index=\"kidx\" 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[$pidx].resource-resolution-data.resource-key_length`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1057.639305114746,
-        "y": 817.857488155365,
-        "z": "6621aeef.bf45",
+        "x": 1417.6393966674805,
+        "y": 2293.0241141319275,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "6474a2a3.971edc"
+                "e4dea9e2.e240e8"
             ]
         ]
     },
     {
-        "id": "f691073d.b6c728",
+        "id": "3a044c4d.1e750c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 328.03570556640625,
-        "y": 416.7976379394531,
-        "z": "6621aeef.bf45",
+        "x": 625.5358581542969,
+        "y": 1961.9642333984375,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "cf602ff2.69d16",
-                "7e0801d1.7a2c7"
+                "c92d4312.5079b8",
+                "4ffc883e.37e15"
             ]
         ]
     },
     {
-        "id": "bb3b73.97d8649",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss.eipam.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 126.5833740234375,
-        "y": 1925.2379150390625,
-        "z": "6621aeef.bf45",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6bcbec21.cdc8a4",
+        "id": "776bc197.c4cea8",
         "type": "update",
         "name": "update IPAM_IP_ASSIGNEMENT to PENDING_DELETE...",
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id\" >",
         "comments": "",
         "outputs": 1,
-        "x": 2190.2740478515625,
-        "y": 1657.0001611709595,
-        "z": "6621aeef.bf45",
+        "x": 2550.274139404297,
+        "y": 3132.166787147522,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "95bfe2aa.52a368"
+                "b463a755.296e38"
             ]
         ]
     },
     {
-        "id": "b6dcca73.b383e8",
+        "id": "e61cd52d.9b53c8",
         "type": "set",
         "name": "set status = PENDING_DELETE",
         "xml": "<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n",
         "comments": "",
-        "x": 2100.1905517578125,
-        "y": 1615.3334131240845,
-        "z": "6621aeef.bf45",
+        "x": 2460.190643310547,
+        "y": 3090.500039100647,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "95bfe2aa.52a368",
+        "id": "b463a755.296e38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2497.9405059814453,
-        "y": 1657.5834846496582,
-        "z": "6621aeef.bf45",
+        "x": 2857.9405975341797,
+        "y": 3132.7501106262207,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "91f0feca.0b39d8"
+                "623c3038.c77a88"
             ]
         ]
     },
     {
-        "id": "91f0feca.0b39d8",
+        "id": "623c3038.c77a88",
         "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 updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n",
         "comments": "",
-        "x": 2676.9407958984375,
-        "y": 1657.393105506897,
-        "z": "6621aeef.bf45",
+        "x": 3036.940887451172,
+        "y": 3132.5597314834595,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "cef88c60.c3ce7",
+        "id": "46730243.5a19d4",
         "type": "execute",
         "name": "execute Netbox unassign IP addresses",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"unassignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2120.27392578125,
-        "y": 1703.2502222061157,
-        "z": "6621aeef.bf45",
+        "x": 2480.2740173339844,
+        "y": 3178.416848182678,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "9a25867f.7917b",
-                "4c46f42f.389724"
+                "41c93106.7eb858",
+                "7f8823ca.cd3dd4"
             ]
         ]
     },
     {
-        "id": "9a25867f.7917b",
+        "id": "41c93106.7eb858",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2363.607192993164,
-        "y": 1703.250171661377,
-        "z": "6621aeef.bf45",
+        "x": 2723.6072845458984,
+        "y": 3178.4167976379395,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "d8d6e44a.e2b038"
+                "572457e6.ddb978"
             ]
         ]
     },
     {
-        "id": "d8d6e44a.e2b038",
+        "id": "572457e6.ddb978",
         "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 in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`\" />\n",
         "comments": "",
-        "x": 2525.607219696045,
-        "y": 1703.0599069595337,
-        "z": "6621aeef.bf45",
+        "x": 2885.6073112487793,
+        "y": 3178.226532936096,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "7f0db226.60e56c",
+        "id": "a33aa0af.bd279",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1840.8929595947266,
-        "y": 1614.7500410079956,
-        "z": "6621aeef.bf45",
+        "x": 2200.893051147461,
+        "y": 3089.916666984558,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "b6dcca73.b383e8",
-                "6bcbec21.cdc8a4",
-                "cef88c60.c3ce7"
+                "e61cd52d.9b53c8",
+                "776bc197.c4cea8",
+                "46730243.5a19d4"
             ]
         ]
     },
     {
-        "id": "7e0801d1.7a2c7",
+        "id": "4ffc883e.37e15",
         "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=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 563.84130859375,
-        "y": 473.74212646484375,
-        "z": "6621aeef.bf45",
+        "x": 861.3414611816406,
+        "y": 2018.9087219238281,
+        "z": "9db1531d.07a1a",
         "wires": [
             []
         ]
     },
     {
-        "id": "eae11399.61a66",
+        "id": "33db91f0.e9f01e",
         "type": "outcome",
         "name": "vf-module-id",
         "xml": "<outcome value='vf-module-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594.0001373291016,
-        "y": 865.7185616493225,
-        "z": "6621aeef.bf45",
+        "x": 1954.000228881836,
+        "y": 2340.885187625885,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "92eb3aef.6fece8"
+                "6181952e.31b6cc"
             ]
         ]
     },
     {
-        "id": "92eb3aef.6fece8",
+        "id": "6181952e.31b6cc",
         "type": "set",
         "name": "set tmp.ss.vf-module-id",
         "xml": "<set>\n<parameter name='tmp.ss.vf-module-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1860.000259399414,
-        "y": 865.7185616493225,
-        "z": "6621aeef.bf45",
+        "x": 2220.0003509521484,
+        "y": 2340.885187625885,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "6c93627f.1091d4",
+        "id": "369a3888.44684",
         "type": "set",
         "name": "set resource-resolution-data.status = 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[$pidx].resource-resolution-data.status' \n\tvalue='DELETED' />\n",
         "comments": "",
-        "x": 2630.4998779296875,
-        "y": 1758.5709228515625,
-        "z": "6621aeef.bf45",
+        "x": 2990.499969482422,
+        "y": 3233.737548828125,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "7bb69337.4e6394",
+        "id": "5e2abf9b.b85b4",
         "type": "outcome",
         "name": "prefix-id",
         "xml": "<outcome value='prefix-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1583.0558013916016,
-        "y": 909.9685921669006,
-        "z": "6621aeef.bf45",
+        "x": 1943.055892944336,
+        "y": 2385.135218143463,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "ce6e3b64.bdad58"
+                "6a64ea7a.aa0bac"
             ]
         ]
     },
     {
-        "id": "ce6e3b64.bdad58",
+        "id": "6a64ea7a.aa0bac",
         "type": "set",
         "name": "set prefix-id",
         "xml": "<set>\n<parameter name='tmp.ss.prefix-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1829.5558013916016,
-        "y": 910.2185616493225,
-        "z": "6621aeef.bf45",
+        "x": 2189.555892944336,
+        "y": 2385.385187625885,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "f6d1639e.62ad88",
+        "id": "5ddc29c0.4ba838",
         "type": "execute",
         "name": "execute NetboxClient assignIpAddress",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"assignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"vf_module_id\" value=\"`$tmp.ss.vf-module-id`\" />\n<parameter name=\"prefix_id\" value=\"`$tmp.ss.prefix-id`\" />\n<parameter name=\"resource_name\" value=\"`$tmp.ss.param.name`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1364.9525756835938,
-        "y": 1224.4884424209595,
-        "z": "6621aeef.bf45",
+        "x": 1724.9526672363281,
+        "y": 2699.655068397522,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "63ffe78c.535b98",
-                "fd56af84.b7a68"
+                "b4f4fccf.d98da",
+                "69e14266.f416c4"
             ]
         ]
     },
     {
-        "id": "63ffe78c.535b98",
+        "id": "b4f4fccf.d98da",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1681.9525756835938,
-        "y": 1226.4883813858032,
-        "z": "6621aeef.bf45",
+        "x": 2041.9526672363281,
+        "y": 2701.6550073623657,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "19c227a3.522448"
+                "3690386c.790168"
             ]
         ]
     },
     {
-        "id": "19c227a3.522448",
+        "id": "3690386c.790168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1889.9525756835938,
-        "y": 1230.4883813858032,
-        "z": "6621aeef.bf45",
+        "x": 2249.952667236328,
+        "y": 2705.6550073623657,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "fbac9633.970dc8",
-                "12ebaeec.b6b371"
+                "e87ee382.86daa8",
+                "8cda7799.2cc048"
             ]
         ]
     },
     {
-        "id": "fbac9633.970dc8",
+        "id": "e87ee382.86daa8",
         "type": "set",
         "name": "set resource-resolution-data.status = 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[$pidx].resource-resolution-data.status' value='FAILED' />\n",
         "comments": "",
-        "x": 2206.95263671875,
-        "y": 1234.488350868225,
-        "z": "6621aeef.bf45",
+        "x": 2566.9527282714844,
+        "y": 2709.6549768447876,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "12ebaeec.b6b371",
+        "id": "8cda7799.2cc048",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2104.33349609375,
-        "y": 1284.0916137695312,
-        "z": "6621aeef.bf45",
+        "x": 2464.3335876464844,
+        "y": 2759.2582397460938,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "dbf6bad6.fbad2",
+        "id": "e9502efd.cfacb8",
         "type": "set",
         "name": "set resource-resolution-data.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[$pidx].resource-resolution-data.status' \n\tvalue='SUCCESS' />\n",
         "comments": "",
-        "x": 2186.0357666015625,
-        "y": 1400.17919921875,
-        "z": "6621aeef.bf45",
+        "x": 2552.0357666015625,
+        "y": 2930.3457641601562,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "5c5c662c.f08f1",
+        "id": "a20a3dc.5fc3fc",
         "type": "outcome",
         "name": "ip-address-id",
         "xml": "<outcome value='ip-address-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596.9369506835938,
-        "y": 954.8256659507751,
-        "z": "6621aeef.bf45",
+        "x": 1956.9370422363281,
+        "y": 2429.9922919273376,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "163b9c18.cbc31c"
+                "a24b6a2f.50759"
             ]
         ]
     },
     {
-        "id": "163b9c18.cbc31c",
+        "id": "a24b6a2f.50759",
         "type": "set",
         "name": "ip-address-id",
         "xml": "<set>\n<parameter name='tmp.ss.ip-address-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1831.9368286132812,
-        "y": 954.8257269859314,
-        "z": "6621aeef.bf45",
+        "x": 2191.9369201660156,
+        "y": 2429.992352962494,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "90dc69e5.6405",
+        "id": "82eaeb00.f8a53",
         "type": "outcome",
         "name": "external_key",
         "xml": "<outcome value='external_key'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1584.5559692382812,
-        "y": 1000.5399603843689,
-        "z": "6621aeef.bf45",
+        "x": 1944.5560607910156,
+        "y": 2475.7065863609314,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "8dc251fb.daa1e8"
+                "f64e7f28.5f1c28"
             ]
         ]
     },
     {
-        "id": "8dc251fb.daa1e8",
+        "id": "f64e7f28.5f1c28",
         "type": "set",
         "name": "set external-key",
         "xml": "<set>\n<parameter name='tmp.ss.external-key' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1833.1273803710938,
-        "y": 1000.5400214195251,
-        "z": "6621aeef.bf45",
+        "x": 2193.127471923828,
+        "y": 2475.7066473960876,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "9a404501.e9a9f",
+        "id": "f2a77014.d729d8",
         "type": "set",
         "name": "set tmp.ss.param.name",
         "xml": "<set>\n<parameter name='tmp.ss.param.name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`' />\n",
         "comments": "",
-        "x": 873.3493728637695,
-        "y": 458.79367208480835,
-        "z": "6621aeef.bf45",
+        "x": 1170.8495254516602,
+        "y": 2003.9602675437927,
+        "z": "9db1531d.07a1a",
         "wires": []
     },
     {
-        "id": "5c183d21.694a54",
+        "id": "8094ff69.1f8708",
         "type": "switchNode",
         "name": "switch: resource-resolution-data.status",
         "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[$pidx].resource-resolution-data.status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 413.2855224609375,
-        "y": 794.7620849609375,
-        "z": "6621aeef.bf45",
+        "x": 773.2856140136719,
+        "y": 2269.9287109375,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "3e98782d.40c0e8",
-                "511a57cd.b0751"
+                "8231bfda.4aa0f8",
+                "4c0fccb3.f454ac"
             ]
         ]
     },
     {
-        "id": "3e98782d.40c0e8",
+        "id": "8231bfda.4aa0f8",
         "type": "not-found",
         "name": "FAILED",
         "xml": "<outcome value='FAILED'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 644.7143249511719,
-        "y": 790.7621307373047,
-        "z": "6621aeef.bf45",
+        "x": 1004.7144165039062,
+        "y": 2265.928756713867,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "2b59421f.30834e"
+                "575caaa7.2470a4"
             ]
         ]
     },
     {
-        "id": "511a57cd.b0751",
+        "id": "4c0fccb3.f454ac",
         "type": "success",
         "name": "PENDING",
         "xml": "<outcome value='PENDING'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 651.4285011291504,
-        "y": 842.4764587879181,
-        "z": "6621aeef.bf45",
+        "x": 1011.4285926818848,
+        "y": 2317.6430847644806,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "2b59421f.30834e"
+                "575caaa7.2470a4"
             ]
         ]
     },
     {
-        "id": "2b59421f.30834e",
+        "id": "575caaa7.2470a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 806.142822265625,
-        "y": 814.7621459960938,
-        "z": "6621aeef.bf45",
+        "x": 1166.1429138183594,
+        "y": 2289.9287719726562,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "f6c6e34.fe93ea",
-                "b3f43dd2.42288"
+                "eabe3654.2861f",
+                "423ab3ab.c683cc"
             ]
         ]
     },
     {
-        "id": "cfd59a42.40ec28",
+        "id": "e4db42f9.ac9b4",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>",
         "comments": "",
         "outputs": 1,
-        "x": 863.9999389648438,
-        "y": 1222.5716943740845,
-        "z": "6621aeef.bf45",
+        "x": 1224.0000305175781,
+        "y": 2697.738320350647,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "c384a118.8056f"
+                "de47a062.0e7368"
             ]
         ]
     },
     {
-        "id": "b3f43dd2.42288",
+        "id": "423ab3ab.c683cc",
         "type": "switchNode",
         "name": "switch: ss.capability-action",
         "xml": "<switch test='`$ss.capability-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 627.9999389648438,
-        "y": 1220.5716943740845,
-        "z": "6621aeef.bf45",
+        "x": 988.0000305175781,
+        "y": 2695.738320350647,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "cfd59a42.40ec28",
-                "2ff7ecc5.284a3c"
+                "e4db42f9.ac9b4",
+                "19870db6.43192a"
             ]
         ]
     },
     {
-        "id": "c384a118.8056f",
+        "id": "de47a062.0e7368",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1039.4285888671875,
-        "y": 1223.4289331436157,
-        "z": "6621aeef.bf45",
+        "x": 1399.4286804199219,
+        "y": 2698.595559120178,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "f6d1639e.62ad88"
+                "5ddc29c0.4ba838"
             ]
         ]
     },
     {
-        "id": "64c75b78.f36b24",
+        "id": "95406bea.6b1b6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1658.6785583496094,
-        "y": 1614.0357961654663,
-        "z": "6621aeef.bf45",
+        "x": 2018.6786499023438,
+        "y": 3089.202422142029,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "7f0db226.60e56c"
+                "a33aa0af.bd279"
             ]
         ]
     },
     {
-        "id": "fd56af84.b7a68",
+        "id": "69e14266.f416c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1689.9999999999998,
-        "y": 1289.9999999999998,
-        "z": "6621aeef.bf45",
+        "x": 2050.0000915527344,
+        "y": 2765.1666259765625,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "7c8df38.541b98c"
+                "3337d755.bc6f9"
             ]
         ]
     },
     {
-        "id": "131e59c0.7aa77e",
+        "id": "d043ccbb.6e195",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1832.1072213309153,
-        "y": 1566.7500611713954,
-        "z": "6621aeef.bf45",
+        "x": 2192.1073128836497,
+        "y": 3041.916687147958,
+        "z": "9db1531d.07a1a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c8df38.541b98c",
+        "id": "3337d755.bc6f9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1884.28564453125,
-        "y": 1370.0001220703125,
-        "z": "6621aeef.bf45",
+        "x": 2244.2857360839844,
+        "y": 2845.166748046875,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "dbf6bad6.fbad2",
-                "235c0ede.173f92"
+                "e9502efd.cfacb8",
+                "b434a262.2a412",
+                "fd2e7345.c27e6"
             ]
         ]
     },
     {
-        "id": "4c46f42f.389724",
+        "id": "7f8823ca.cd3dd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2368.5718994140625,
-        "y": 1757.142822265625,
-        "z": "6621aeef.bf45",
+        "x": 2728.571990966797,
+        "y": 3232.3094482421875,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "369a3888.44684"
+            ]
+        ]
+    },
+    {
+        "id": "a51df821.acc4",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 600.4285583496094,
+        "y": 441.4284896850586,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "a0639b3c.7eba9"
+            ]
+        ]
+    },
+    {
+        "id": "9b5b9dd.e182f6",
+        "type": "switchNode",
+        "name": "switch capability-type. vnf",
+        "xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 397,
+        "y": 442.14276123046875,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "a51df821.acc4"
+            ]
+        ]
+    },
+    {
+        "id": "727a4c78.25da9c",
+        "type": "switchNode",
+        "name": "switch capability-type vf-module",
+        "xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 419.28582763671875,
+        "y": 1827.6666259765625,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "5b0a7046.83e3"
+            ]
+        ]
+    },
+    {
+        "id": "5b0a7046.83e3",
+        "type": "not-found",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 638.2858276367188,
+        "y": 1828.6666870117188,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "3a044c4d.1e750c"
+            ]
+        ]
+    },
+    {
+        "id": "25965467.621de4",
+        "type": "outcome",
+        "name": "unassign",
+        "xml": "<outcome value='unassign'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1213.3333129882812,
+        "y": 1557.3690576553345,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "f0b88a86.aebb68"
+            ]
+        ]
+    },
+    {
+        "id": "e7afaccf.d0036",
+        "type": "set",
+        "name": "set tmp.ss.param.capability-name",
+        "xml": "<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
+        "comments": "",
+        "x": 1222.1705474853516,
+        "y": 537.4722971916199,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "bfedad8c.b95118",
+        "type": "for",
+        "name": "for pidx in param_length",
+        "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": 932.3847732543945,
+        "y": 537.54376745224,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "eadf5468.9c709",
+                "f0ad10ad.1e953",
+                "e7afaccf.d0036"
+            ]
+        ]
+    },
+    {
+        "id": "f0ad10ad.1e953",
+        "type": "switchNode",
+        "name": "switch: capability-name - ss vs param",
+        "xml": "<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1235.2460098266602,
+        "y": 618.8215498924255,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "6a7d5101.40aa8"
+            ]
+        ]
+    },
+    {
+        "id": "6a7d5101.40aa8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1473.9960174560547,
+        "y": 618.5715498924255,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "b4530e81.fa1df"
+            ]
+        ]
+    },
+    {
+        "id": "e13f79d4.74035",
+        "type": "switchNode",
+        "name": "switch: resource-key[].name",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1662.2185287475586,
+        "y": 810.8654227256775,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "2eeaa08a.1d2c78",
+                "9af0367b.dbd1f8",
+                "f747f187.002e28",
+                "81e1796a.cad958"
+            ]
+        ]
+    },
+    {
+        "id": "9af0367b.dbd1f8",
+        "type": "outcome",
+        "name": "service-instance-id",
+        "xml": "<outcome value='service-instance-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1933.607437133789,
+        "y": 810.3376412391663,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "c656a145.06dbc"
+            ]
+        ]
+    },
+    {
+        "id": "c656a145.06dbc",
+        "type": "set",
+        "name": "set tmp.ss.service-instance-id",
+        "xml": "<set>\n<parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
+        "comments": "",
+        "x": 2199.857437133789,
+        "y": 810.0876412391663,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "41f4db04.700f14",
+        "type": "update",
+        "name": "get-resource IPAM_IP_ASSIGNEMENT",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from IPAM_IP_ASSIGNEMENT \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1688.8173828125,
+        "y": 1556.190468788147,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "b267b2b4.23a3e8",
+                "9b01dbab.a7a7a8"
+            ]
+        ]
+    },
+    {
+        "id": "b267b2b4.23a3e8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1983.4047203063965,
+        "y": 1557.1905019283295,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "c67fc199.97dec"
+            ]
+        ]
+    },
+    {
+        "id": "f0b88a86.aebb68",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1382.6546783447266,
+        "y": 1557.8334131240845,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "41f4db04.700f14"
+            ]
+        ]
+    },
+    {
+        "id": "e6246ef9.3e7788",
+        "type": "for",
+        "name": "for kidx in resource-key_length",
+        "xml": "<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`\">",
+        "comments": "",
+        "outputs": 1,
+        "x": 1379.0796127319336,
+        "y": 808.7265067100525,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "e13f79d4.74035"
+            ]
+        ]
+    },
+    {
+        "id": "a0639b3c.7eba9",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 648.642822265625,
+        "y": 535.666748046875,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "bfedad8c.b95118",
+                "dd52194f.db49b8"
+            ]
+        ]
+    },
+    {
+        "id": "37aec3a4.7d6aa4",
+        "type": "update",
+        "name": "update IPAM_IP_ASSIGNEMENT to PENDING_DELETE...",
+        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2511.71435546875,
+        "y": 1647.869179725647,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "f17fba04.5953f8"
+            ]
+        ]
+    },
+    {
+        "id": "f7bb8b39.bef09",
+        "type": "set",
+        "name": "set status = PENDING_DELETE",
+        "xml": "<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n",
+        "comments": "",
+        "x": 2421.630859375,
+        "y": 1606.202431678772,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "f17fba04.5953f8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2819.380813598633,
+        "y": 1648.4525032043457,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "7d1f077f.575248"
+            ]
+        ]
+    },
+    {
+        "id": "7d1f077f.575248",
+        "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 updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n",
+        "comments": "",
+        "x": 2998.381103515625,
+        "y": 1648.2621240615845,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "91f6c6fc.2974a8",
+        "type": "execute",
+        "name": "execute Netbox unassign IP addresses",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"unassignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2441.7142333984375,
+        "y": 1694.1192407608032,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "54af54c4.b3a344",
+                "286269c8.56b2fe"
+            ]
+        ]
+    },
+    {
+        "id": "54af54c4.b3a344",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2685.0475006103516,
+        "y": 1694.1191902160645,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "3d527d1f.8bda2a"
+            ]
+        ]
+    },
+    {
+        "id": "3d527d1f.8bda2a",
+        "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 in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`\" />\n",
+        "comments": "",
+        "x": 2847.0475273132324,
+        "y": 1693.9289255142212,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "8bad1bbc.e7a648",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2162.333267211914,
+        "y": 1605.619059562683,
+        "z": "9db1531d.07a1a",
         "wires": [
             [
-                "6c93627f.1091d4"
+                "f7bb8b39.bef09",
+                "37aec3a4.7d6aa4",
+                "91f6c6fc.2974a8"
             ]
         ]
+    },
+    {
+        "id": "dd52194f.db49b8",
+        "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=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 884.4484252929688,
+        "y": 592.6112365722656,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2eeaa08a.1d2c78",
+        "type": "outcome",
+        "name": "vnf-id",
+        "xml": "<outcome value='vnf-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1915.440444946289,
+        "y": 856.58758020401,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "e99c4040.fdfb6"
+            ]
+        ]
+    },
+    {
+        "id": "e99c4040.fdfb6",
+        "type": "set",
+        "name": "set tmp.ss.vnf-id",
+        "xml": "<set>\n<parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
+        "comments": "",
+        "x": 2181.4405670166016,
+        "y": 856.58758020401,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "8b1d70.bdf8029",
+        "type": "set",
+        "name": "set resource-resolution-data.status = DELETED",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' \n\tvalue='DELETED' />\n",
+        "comments": "",
+        "x": 2951.940185546875,
+        "y": 1749.43994140625,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "f747f187.002e28",
+        "type": "outcome",
+        "name": "prefix-id",
+        "xml": "<outcome value='prefix-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1904.496109008789,
+        "y": 900.8376107215881,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "2ed5a6cf.2a2e6a"
+            ]
+        ]
+    },
+    {
+        "id": "2ed5a6cf.2a2e6a",
+        "type": "set",
+        "name": "set prefix-id",
+        "xml": "<set>\n<parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
+        "comments": "",
+        "x": 2150.996109008789,
+        "y": 901.08758020401,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "cb98d7d9.b5a08",
+        "type": "execute",
+        "name": "execute NetboxClient assignIpAddress",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"assignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"vf_module_id\" value=\"`$tmp.ss.vnf-id`\" />\n<parameter name=\"prefix_id\" value=\"`$tmp.ss.prefix-id`\" />\n<parameter name=\"resource_name\" value=\"`$tmp.ss.param.name`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1686.3928833007812,
+        "y": 1215.357460975647,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "158c4088.3cd6c7",
+                "2aec43bd.80530c"
+            ]
+        ]
+    },
+    {
+        "id": "158c4088.3cd6c7",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2003.3928833007812,
+        "y": 1217.3573999404907,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "2e7a036b.bc0adc"
+            ]
+        ]
+    },
+    {
+        "id": "2e7a036b.bc0adc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2211.3928833007812,
+        "y": 1221.3573999404907,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "51bf773d.df62b",
+                "bc6879f4.baae4"
+            ]
+        ]
+    },
+    {
+        "id": "51bf773d.df62b",
+        "type": "set",
+        "name": "set resource-resolution-data.status = FAILED",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' value='FAILED' />\n",
+        "comments": "",
+        "x": 2528.3929443359375,
+        "y": 1225.3573694229126,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "bc6879f4.baae4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 2425.7738037109375,
+        "y": 1274.9606323242188,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "49b2f547.09aa04",
+        "type": "set",
+        "name": "set resource-resolution-data.status = SUCCESS",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' \n\tvalue='SUCCESS' />\n",
+        "comments": "",
+        "x": 2505.47607421875,
+        "y": 1420.0482177734375,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "81e1796a.cad958",
+        "type": "outcome",
+        "name": "external_key",
+        "xml": "<outcome value='external_key'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1927.246337890625,
+        "y": 951.4089965820312,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "96f2e2c3.446d68"
+            ]
+        ]
+    },
+    {
+        "id": "96f2e2c3.446d68",
+        "type": "set",
+        "name": "set external-key",
+        "xml": "<set>\n<parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
+        "comments": "",
+        "x": 2175.8177490234375,
+        "y": 951.4090576171875,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "eadf5468.9c709",
+        "type": "set",
+        "name": "set tmp.ss.param.name",
+        "xml": "<set>\n<parameter name='tmp.ss.param.name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].name`' />\n",
+        "comments": "",
+        "x": 1193.9564895629883,
+        "y": 577.6627821922302,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "b4530e81.fa1df",
+        "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": 734.725830078125,
+        "y": 785.631103515625,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "ef20c0ae.2f0268",
+                "fe2c0013.43141"
+            ]
+        ]
+    },
+    {
+        "id": "ef20c0ae.2f0268",
+        "type": "not-found",
+        "name": "FAILED",
+        "xml": "<outcome value='FAILED'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 966.1546325683594,
+        "y": 781.6311492919922,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "b3e8cd71.0d271"
+            ]
+        ]
+    },
+    {
+        "id": "fe2c0013.43141",
+        "type": "success",
+        "name": "PENDING",
+        "xml": "<outcome value='PENDING'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 972.8688087463379,
+        "y": 833.3454773426056,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "b3e8cd71.0d271"
+            ]
+        ]
+    },
+    {
+        "id": "b3e8cd71.0d271",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1127.5831298828125,
+        "y": 805.6311645507812,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "e6246ef9.3e7788",
+                "e6294bd0.41d4c8"
+            ]
+        ]
+    },
+    {
+        "id": "c1c70c33.d44a98",
+        "type": "outcome",
+        "name": "assign",
+        "xml": "<outcome value='assign'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1185.4402465820312,
+        "y": 1213.440712928772,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "1bb6495a.fa8da7"
+            ]
+        ]
+    },
+    {
+        "id": "e6294bd0.41d4c8",
+        "type": "switchNode",
+        "name": "switch: ss.capability-action",
+        "xml": "<switch test='`$ss.capability-action`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 949.4402465820312,
+        "y": 1211.440712928772,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "c1c70c33.d44a98",
+                "25965467.621de4"
+            ]
+        ]
+    },
+    {
+        "id": "1bb6495a.fa8da7",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1360.868896484375,
+        "y": 1214.2979516983032,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "cb98d7d9.b5a08"
+            ]
+        ]
+    },
+    {
+        "id": "9b01dbab.a7a7a8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1980.1188659667969,
+        "y": 1604.9048147201538,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "8bad1bbc.e7a648"
+            ]
+        ]
+    },
+    {
+        "id": "2aec43bd.80530c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2011.4403076171875,
+        "y": 1280.8690185546873,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "b964039a.43a1a"
+            ]
+        ]
+    },
+    {
+        "id": "c67fc199.97dec",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2153.547528948103,
+        "y": 1557.6190797260829,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b964039a.43a1a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2205.7259521484375,
+        "y": 1360.869140625,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "49b2f547.09aa04",
+                "3bdfdc4f.b39f24",
+                "4628865b.a3d7d"
+            ]
+        ]
+    },
+    {
+        "id": "286269c8.56b2fe",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2690.01220703125,
+        "y": 1748.0118408203125,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            [
+                "8b1d70.bdf8029"
+            ]
+        ]
+    },
+    {
+        "id": "4628865b.a3d7d",
+        "type": "set",
+        "name": "set service-data...param[].value = ip-address",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].value' \n\tvalue='`$ip[0]`' />\n",
+        "comments": "",
+        "x": 2495,
+        "y": 1380,
+        "z": "9db1531d.07a1a",
+        "wires": []
+    },
+    {
+        "id": "3bdfdc4f.b39f24",
+        "type": "execute",
+        "name": "SliStringUtils - split subnet",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n    <parameter name=\"original_string\" value=\"`$self_serve_netbox_ip_assignement.ip-address`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"ip\" />\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2439,
+        "y": 1340,
+        "z": "9db1531d.07a1a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fd2e7345.c27e6",
+        "type": "execute",
+        "name": "SliStringUtils - split subnet",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n    <parameter name=\"original_string\" value=\"`$self_serve_netbox_ip_assignement.ip-address`\" />\n    <parameter name=\"regex\" value=\"/\"/>\n    <parameter name=\"ctx_memory_result_key\" value=\"ip\" />\n  \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2481,
+        "y": 2829,
+        "z": "9db1531d.07a1a",
+        "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-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
index 53818a46..45efe1a3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
@@ -1,1268 +1,1268 @@
 [
-  {
-    "id": "79cac42d.82a4dc",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 140,
-    "y": 84.99999749660492,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "f47fc6b0.f6a1d8"
-      ]
-    ]
-  },
-  {
-    "id": "629c9f43.786f9",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 163.19049072265625,
-    "y": 199.84921395778656,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "6aad54ac.f3caac",
-        "3ec605f9.8838da",
-        "23449213.b3818e",
-        "840f76a2.614648",
-        "decf4ed7.49434",
-        "448e6879.87f338",
-        "d9639a54.037b48",
-        "ee1bc60b.f75e88"
-      ]
-    ]
-  },
-  {
-    "id": "b7b42bd3.4f3918",
-    "type": "method",
-    "name": "method self-serve-vf-module-assign",
-    "xml": "<method rpc='self-serve-vf-module-assign' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 243.76190948486328,
-    "y": 139.7063525915146,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "629c9f43.786f9"
-      ]
-    ]
-  },
-  {
-    "id": "f47fc6b0.f6a1d8",
-    "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": 402.23819732666016,
-    "y": 85.1904901266098,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "b7b42bd3.4f3918"
-      ]
-    ]
-  },
-  {
-    "id": "3ec605f9.8838da",
-    "type": "switchNode",
-    "name": "switch vf-module-parameters.param_length",
-    "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 478.2500305175781,
-    "y": 1402.3691610097885,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "1a9c3c61.643984"
-      ]
-    ]
-  },
-  {
-    "id": "1a9c3c61.643984",
-    "type": "other",
-    "name": "NULL",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 738.2500610351562,
-    "y": 1402.3691610097885,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "9d73c04f.a8004"
-      ]
-    ]
-  },
-  {
-    "id": "beaa39ce.b3ffc8",
-    "type": "call",
-    "name": "call GENERIC-RESOURCE-API:self-serve-vfmodule-ra-assignment",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vfmodule-ra-assignment' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1279.9643096923828,
-    "y": 1449.6549113988876,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3b98ee66.3d30a2"
-      ]
-    ]
-  },
-  {
-    "id": "3228d8db.9bd078",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n",
-    "comments": "",
-    "x": 1760.6785507202148,
-    "y": 1449.2263149023056,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "4c4fa3b4.ff618c",
-    "type": "for",
-    "name": "foreach vf-module-parameters.param[]",
-    "xml": "<for index='pidx' 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": 763.5359954833984,
-    "y": 1712.5477479696274,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "4e0d4948.3d6618",
-        "b58f94e5.3a5748"
-      ]
-    ]
-  },
-  {
-    "id": "6aad54ac.f3caac",
-    "type": "set",
-    "name": "set ss.capability.execution-order[]",
-    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
-    "comments": "",
-    "x": 450.41666412353516,
-    "y": 1264.4286407232285,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "23449213.b3818e",
-    "type": "for",
-    "name": "foreach capability-order[]",
-    "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 419.1786193847656,
-    "y": 1568.3690408468246,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "79b45fed.9e95a",
-        "6e6f02a3.6e1a8c",
-        "4c4fa3b4.ff618c",
-        "6825ba6.a6c7b44"
-      ]
-    ]
-  },
-  {
-    "id": "4e0d4948.3d6618",
-    "type": "switchNode",
-    "name": "switch capability-name param vs. execution",
-    "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1129.9288177490234,
-    "y": 1758.1905406713486,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "b70e352c.4630e8"
-      ]
-    ]
-  },
-  {
-    "id": "b70e352c.4630e8",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1393.4288177490234,
-    "y": 1758.4405406713486,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "39d72ba9.0f9c94"
-      ]
-    ]
-  },
-  {
-    "id": "3b98ee66.3d30a2",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1606.5356559753418,
-    "y": 1449.0835050344467,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3228d8db.9bd078"
-      ]
-    ]
-  },
-  {
-    "id": "79b45fed.9e95a",
-    "type": "set",
-    "name": "set ss.capability-name",
-    "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order\n-->",
-    "comments": "",
-    "x": 710.5356750488281,
-    "y": 1568.3214925527573,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "b58f94e5.3a5748",
-    "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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n",
-    "comments": "",
-    "x": 1079.2858428955078,
-    "y": 1712.7977508306503,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "6e6f02a3.6e1a8c",
-    "type": "set",
-    "name": "set ss.capability-action = assign",
-    "xml": "<set>\n<parameter name='ss.capability-action' value='assign' />\n",
-    "comments": "",
-    "x": 741.2498168945312,
-    "y": 1615.2380765676498,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "6825ba6.a6c7b44",
-    "type": "set",
-    "name": "set capability-dg with 'self-serve-' + capability-name",
-    "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
-    "comments": "",
-    "x": 803.5832824707031,
-    "y": 1663.8929475545883,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "efb9f733.4243e8",
-    "type": "set",
-    "name": "set sdnc-generated-cloud-resources = true",
-    "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.sdnc-generated-cloud-resources' \n\tvalue='true' />\n",
-    "comments": "",
-    "x": 1065.952392578125,
-    "y": 1150.8573163747787,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "39d72ba9.0f9c94",
-    "type": "switchNode",
-    "name": "switch resource-resolution-data.status",
-    "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[$pidx].resource-resolution-data.status`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 509.5121765136719,
-    "y": 2286.9723123311996,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "c3a7253a.e36418",
-        "8f6e910.95aa57"
-      ]
-    ]
-  },
-  {
-    "id": "c3a7253a.e36418",
-    "type": "other",
-    "name": "PENDING",
-    "xml": "<outcome value='PENDING'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 778.8693923950195,
-    "y": 2286.972268462181,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "5345ddf0.1150f4"
-      ]
-    ]
-  },
-  {
-    "id": "8f6e910.95aa57",
-    "type": "other",
-    "name": "FAILED",
-    "xml": "<outcome value='FAILED'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 772.4052085876465,
-    "y": 2337.936599135399,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "5345ddf0.1150f4"
-      ]
-    ]
-  },
-  {
-    "id": "5345ddf0.1150f4",
-    "type": "call",
-    "name": "call ss.capability-dg",
-    "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 987.5239410400391,
-    "y": 2338.698450446129,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "f18bef24.d1ba1"
-      ]
-    ]
-  },
-  {
-    "id": "9fad02a1.51c23",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`\" />\n",
-    "comments": "",
-    "x": 1562.2142753601074,
-    "y": 2692.3893016576767,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "f18bef24.d1ba1",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1180.5592918395996,
-    "y": 2338.412728667259,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "dff817e.b93aee8"
-      ]
-    ]
-  },
-  {
-    "id": "dff817e.b93aee8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1343.833408355713,
-    "y": 2337.7222694158554,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "9fad02a1.51c23",
-        "e3eb24ad.1f9df8",
-        "f1f25f48.ce065",
-        "dbccdeae.36726",
-        "deeeb223.3247f",
-        "5998fcd6.dc3424"
-      ]
-    ]
-  },
-  {
-    "id": "e3eb24ad.1f9df8",
-    "type": "execute",
-    "name": "execute RestApiCallNode - PUT vf-module",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-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-vfmodule\" />\n\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1659.3808479309082,
-    "y": 2594.096228957176,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "67fa2519.b6797c",
-        "ed4a64cf.4b1be8"
-      ]
-    ]
-  },
-  {
-    "id": "67fa2519.b6797c",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1933.9745140075684,
-    "y": 2648.0943826436996,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "67b02263.04705c"
-      ]
-    ]
-  },
-  {
-    "id": "ed4a64cf.4b1be8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1926.403148651123,
-    "y": 2594.5944026708603,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "67b02263.04705c"
-      ]
-    ]
-  },
-  {
-    "id": "448e6879.87f338",
-    "type": "execute",
-    "name": "printContext",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vf-assign.log' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 361.75794219970703,
-    "y": 2839.123444914818,
-    "z": "79df67f4.514258",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "840f76a2.614648",
-    "type": "switchNode",
-    "name": "switch vf-module_length",
-    "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 416.2022895812988,
-    "y": 319.2619956731796,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "5f673fc1.968f5",
-        "fbe20ca5.38fa1",
-        "30e274b0.d8c48c"
-      ]
-    ]
-  },
-  {
-    "id": "5f673fc1.968f5",
-    "type": "other",
-    "name": "NULL",
-    "xml": "<outcome value=''>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 628.8332595825195,
-    "y": 248.65478646755219,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "37c2dea1.9a4e82"
-      ]
-    ]
-  },
-  {
-    "id": "d2367a6.32d0b88",
-    "type": "set",
-    "name": "set vf-module-index=0",
-    "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",
-    "comments": "",
-    "x": 967.9522895812988,
-    "y": 259.5715717077255,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "fbe20ca5.38fa1",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 628.0118522644043,
-    "y": 387.4406465291977,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "6a7324ac.7b0bcc"
-      ]
-    ]
-  },
-  {
-    "id": "bc8a226e.61ad3",
-    "type": "set",
-    "name": "set vf-module-id",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'\n   value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n",
-    "comments": "",
-    "x": 984.2379302978516,
-    "y": 541.6816152334213,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "6fbf85af.00b1fc",
-    "type": "set",
-    "name": "set vf-module-parameters",
-    "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.'\n  value='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.' />\n",
-    "comments": "",
-    "x": 1148.9285278320312,
-    "y": 1401.5244034528732,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "bab133f3.77f18",
-    "type": "set",
-    "name": "set order-status to PendingCreate",
-    "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-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
-    "comments": "",
-    "x": 1038.5121002197266,
-    "y": 1103.5448144674301,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "f1f25f48.ce065",
-    "type": "set",
-    "name": "set vf data for restapi-call-node",
-    "xml": "<set>\n<parameter name='vf.vf-module-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\n<parameter name='vf.vf-module-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\n<parameter name='vf.vf-module-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\n<parameter name='vf.vf-module-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\n<parameter name='vf.vf-module-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\n<parameter name='vf.vf-module-data.vf-module-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\n<parameter name='vf.vf-module-data.vf-module-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\n<parameter name='vf.vf-module-data.vf-module-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />",
-    "comments": "",
-    "x": 1620.8928718566895,
-    "y": 2338.2142461538315,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "dbccdeae.36726",
-    "type": "execute",
-    "name": "generate ss-vfmodule 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-vfmodule-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1687.1428184509277,
-    "y": 2386.2142909765244,
-    "z": "79df67f4.514258",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "deeeb223.3247f",
-    "type": "execute",
-    "name": "generate ss-vfmodule url - replace vnf-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1651.4285163879395,
-    "y": 2434.2732080221176,
-    "z": "79df67f4.514258",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5998fcd6.dc3424",
-    "type": "execute",
-    "name": "generate ss-vfmodule url - replace vf-module-id",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1673.3691902160645,
-    "y": 2484.1897081136703,
-    "z": "79df67f4.514258",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "decf4ed7.49434",
-    "type": "set",
-    "name": "set ss.capability-type = vf-module",
-    "xml": "<set>\n<parameter name='ss.capability-type' value='vf-module' />\n",
-    "comments": "",
-    "x": 451.3214569091797,
-    "y": 1221.4285987615585,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "9d73c04f.a8004",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 913.607153756278,
-    "y": 1402.249972973551,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "6fbf85af.00b1fc",
-        "beaa39ce.b3ffc8"
-      ]
-    ]
-  },
-  {
-    "id": "d9639a54.037b48",
-    "type": "set",
-    "name": "set is-new-vfmodule = true",
-    "xml": "<set>\n<parameter name='is-new-vfmodule' value='true' />\n",
-    "comments": "",
-    "x": 423.0239715576172,
-    "y": 199.67871797084808,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "e87b2ba2.633fe8",
-    "type": "for",
-    "name": "for each existing VF module",
-    "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 986.8452301025391,
-    "y": 387.1309846639633,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3ba9afdd.0665c"
-      ]
-    ]
-  },
-  {
-    "id": "3ba9afdd.0665c",
-    "type": "switchNode",
-    "name": "switch vf-module-id: input vs service-data",
-    "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1297.9643630981445,
-    "y": 387.7023996114731,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "6ce227d9.fecd58"
-      ]
-    ]
-  },
-  {
-    "id": "6ce227d9.fecd58",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1551.8333930969238,
-    "y": 387.52385652065277,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3ad721db.a51a9e"
-      ]
-    ]
-  },
-  {
-    "id": "24be89e2.e6aa36",
-    "type": "set",
-    "name": "set is-new-vfmodule = false",
-    "xml": "<set>\n<parameter name='is-new-vfmodule' value='false' />\n",
-    "comments": "",
-    "x": 1924.0001335144043,
-    "y": 386.7857450246811,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "3ad721db.a51a9e",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1693.2501373291016,
-    "y": 387.0357412099838,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "24be89e2.e6aa36",
-        "1e447c14.cce5b4",
-        "3f5ccfb0.8d0e9"
-      ]
-    ]
-  },
-  {
-    "id": "1e447c14.cce5b4",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 1861.1429252624512,
-    "y": 473.03571927547455,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "3f5ccfb0.8d0e9",
-    "type": "set",
-    "name": "set vf-module-index = idx",
-    "xml": "<set>\n<parameter name='vf-module-index' value='`$idx`' />\n",
-    "comments": "",
-    "x": 1916.9644470214844,
-    "y": 430.0714000463486,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "98a1c4.7cd14e4",
-    "type": "set",
-    "name": "set new vf-module_length = vf-module-index + 1",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n",
-    "comments": "",
-    "x": 1049.3097114562988,
-    "y": 300.8930000066757,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "6a7324ac.7b0bcc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 765.1667671203613,
-    "y": 387.82150876522064,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3c04529f.56f7be",
-        "e87b2ba2.633fe8"
-      ]
-    ]
-  },
-  {
-    "id": "d693bb2e.413388",
-    "type": "set",
-    "name": "set new vf-module_length++",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length + 1`' />\n",
-    "comments": "",
-    "x": 1534.416790008545,
-    "y": 499.5715135335922,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "3c04529f.56f7be",
-    "type": "switchNode",
-    "name": "switch is-new-vfmodule",
-    "xml": "<switch test='`$is-new-vfmodule`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 972.6667633056641,
-    "y": 457.3928884267807,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "4309a437.97210c"
-      ]
-    ]
-  },
-  {
-    "id": "4309a437.97210c",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1170.5239181518555,
-    "y": 456.9643357992172,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "96be78ac.86f8b8"
-      ]
-    ]
-  },
-  {
-    "id": "37c2dea1.9a4e82",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 771.6667633056641,
-    "y": 280.32150304317474,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "98a1c4.7cd14e4",
-        "d2367a6.32d0b88"
-      ]
-    ]
-  },
-  {
-    "id": "30e274b0.d8c48c",
-    "type": "other",
-    "name": "0",
-    "xml": "<outcome value='0'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 630,
-    "y": 318.7499974966049,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "37c2dea1.9a4e82"
-      ]
-    ]
-  },
-  {
-    "id": "ee1bc60b.f75e88",
-    "type": "switchNode",
-    "name": "switch is-new-vfmodule",
-    "xml": "<switch test='`$is-new-vfmodule`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 415.75,
-    "y": 542.4999974966049,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "13983552.193d8b"
-      ]
-    ]
-  },
-  {
-    "id": "13983552.193d8b",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 613.6071548461914,
-    "y": 542.0714448690414,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "cc2f6623.a91fa8"
-      ]
-    ]
-  },
-  {
-    "id": "6d104f94.64904",
-    "type": "set",
-    "name": "Copy vf-module-topology 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-topology-identifier.vf-module-id' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\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-topology-identifier.vf-module-name' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-type' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.tenant' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-cloud-region' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli'\n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-clli`' />",
-    "comments": "",
-    "x": 1029.500015258789,
-    "y": 587.50006711483,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "20ce23b1.a03bcc",
-    "type": "set",
-    "name": "set from DB",
-    "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.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n",
-    "comments": "",
-    "x": 1394.511775970459,
-    "y": 639.9435075521469,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "f594ed84.91226",
-    "type": "switchNode",
-    "name": "switch input model-invariant-uuid",
-    "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1038.3688507080078,
-    "y": 662.7679513692856,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "19819d73.7f6253",
-        "20ac1beb.2d92a4"
-      ]
-    ]
-  },
-  {
-    "id": "19819d73.7f6253",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1244.0355224609375,
-    "y": 639.9109147787094,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "20ce23b1.a03bcc"
-      ]
-    ]
-  },
-  {
-    "id": "20ac1beb.2d92a4",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1245.4641189575195,
-    "y": 684.1965059041977,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "6cb882c0.21104c"
-      ]
-    ]
-  },
-  {
-    "id": "6cb882c0.21104c",
-    "type": "set",
-    "name": "set from input",
-    "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.onap-model-information.model-invariant-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n",
-    "comments": "",
-    "x": 1399.749855041504,
-    "y": 683.6250780820847,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "c1338cf1.49d55",
-    "type": "set",
-    "name": "set from DB",
-    "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.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n",
-    "comments": "",
-    "x": 1395.4640464782715,
-    "y": 728.4821838140488,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "da9fd0ff.5b11d",
-    "type": "switchNode",
-    "name": "switch input model-uuid",
-    "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1010.9878692626953,
-    "y": 751.3066886663437,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "efa13db1.f31b3",
-        "dc586e76.0fe1f"
-      ]
-    ]
-  },
-  {
-    "id": "efa13db1.f31b3",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1244.9878425598145,
-    "y": 728.4496206045151,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "c1338cf1.49d55"
-      ]
-    ]
-  },
-  {
-    "id": "dc586e76.0fe1f",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1246.4164390563965,
-    "y": 772.7352117300034,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "37b9776c.f277f8"
-      ]
-    ]
-  },
-  {
-    "id": "37b9776c.f277f8",
-    "type": "set",
-    "name": "set from input",
-    "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.onap-model-information.model-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n",
-    "comments": "",
-    "x": 1400.7021751403809,
-    "y": 772.1637839078903,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "5083e9e9.b5d418",
-    "type": "set",
-    "name": "set from DB",
-    "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.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n",
-    "comments": "",
-    "x": 1386.6069793701172,
-    "y": 817.3393911123276,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "c4880faa.a34e6",
-    "type": "switchNode",
-    "name": "switch input model-version",
-    "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1013.1307411193848,
-    "y": 840.1638358831406,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "2928758b.07188a",
-        "92292a26.871f08"
-      ]
-    ]
-  },
-  {
-    "id": "2928758b.07188a",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1236.1307258605957,
-    "y": 817.3067983388901,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "5083e9e9.b5d418"
-      ]
-    ]
-  },
-  {
-    "id": "92292a26.871f08",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1237.5593223571777,
-    "y": 861.5923894643784,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "9d1f9d6a.be14d"
-      ]
-    ]
-  },
-  {
-    "id": "9d1f9d6a.be14d",
-    "type": "set",
-    "name": "set from input",
-    "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.onap-model-information.model-version'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n",
-    "comments": "",
-    "x": 1391.845058441162,
-    "y": 861.0209616422653,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "3b78e526.52c88a",
-    "type": "set",
-    "name": "set from DB",
-    "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.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n",
-    "comments": "",
-    "x": 1386.6069793701172,
-    "y": 904.4822133779526,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "63f6df8b.ac388",
-    "type": "switchNode",
-    "name": "switch input model-name",
-    "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1010.1307411193848,
-    "y": 927.3066581487656,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "1a910821.50f078",
-        "8103d79c.7a9d38"
-      ]
-    ]
-  },
-  {
-    "id": "1a910821.50f078",
-    "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1236.1307258605957,
-    "y": 904.4496206045151,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3b78e526.52c88a"
-      ]
-    ]
-  },
-  {
-    "id": "8103d79c.7a9d38",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1237.5593223571777,
-    "y": 948.7352117300034,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "9a8105a2.ce7958"
-      ]
-    ]
-  },
-  {
-    "id": "9a8105a2.ce7958",
-    "type": "set",
-    "name": "set from input",
-    "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.onap-model-information.model-name'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`' />\n",
-    "comments": "",
-    "x": 1391.845058441162,
-    "y": 948.1637839078903,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "c363e16.a6e012",
-    "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.onap-model-information.model-customization-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n",
-    "comments": "",
-    "x": 1023.5830993652344,
-    "y": 1001.2441428899765,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "c5d1dbac.64b258",
-    "type": "set",
-    "name": "copy input data",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.' \n    value='$vf-module-topology-operation-input.vf-module-request-input.' />",
-    "comments": "",
-    "x": 980.2381744384766,
-    "y": 1055.9288457632065,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "cc2f6623.a91fa8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 769.7024154663086,
-    "y": 541.8491891622543,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "f594ed84.91226",
-        "da9fd0ff.5b11d",
-        "c4880faa.a34e6",
-        "63f6df8b.ac388",
-        "c363e16.a6e012",
-        "c5d1dbac.64b258",
-        "6d104f94.64904",
-        "bc8a226e.61ad3",
-        "bab133f3.77f18",
-        "efb9f733.4243e8"
-      ]
-    ]
-  },
-  {
-    "id": "3c2bf88f.0c3cd8",
-    "type": "set",
-    "name": "set vf-module-index = vf-module_length",
-    "xml": "<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",
-    "comments": "",
-    "x": 1567.0000190734863,
-    "y": 455.75000512599945,
-    "z": "79df67f4.514258",
-    "wires": []
-  },
-  {
-    "id": "96be78ac.86f8b8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1313.5000190734863,
-    "y": 456.50000512599945,
-    "z": "79df67f4.514258",
-    "wires": [
-      [
-        "3c2bf88f.0c3cd8",
-        "d693bb2e.413388"
-      ]
-    ]
-  },
-  {
-    "id": "67b02263.04705c",
-    "type": "set",
-    "name": "set error-message",
-    "xml": "<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vf-module assignments during assign in MD-SAL\" />",
-    "comments": "",
-    "x": 2145.714286804199,
-    "y": 2594.4284204244614,
-    "z": "79df67f4.514258",
-    "wires": []
-  }
-]
+    {
+        "id": "12bc7aeb.43dcad",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 122.5,
+        "y": 76.25,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "1e5e184f.28bd88"
+            ]
+        ]
+    },
+    {
+        "id": "42b706d6.4e564",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 145.69049072265625,
+        "y": 191.09921646118164,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "3c32570b.4419e8",
+                "e77c3de3.2b2008",
+                "a2418fcd.7da918",
+                "d51ac9f8.4a305",
+                "9228bdc2.01422",
+                "7163cb8f.b962f4",
+                "462e6ed1.1f6e98",
+                "ef66a16f.622d48"
+            ]
+        ]
+    },
+    {
+        "id": "c48beb19.71a678",
+        "type": "method",
+        "name": "method self-serve-vf-module-assign",
+        "xml": "<method rpc='self-serve-vf-module-assign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 226.26190948486328,
+        "y": 130.95635509490967,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "42b706d6.4e564"
+            ]
+        ]
+    },
+    {
+        "id": "1e5e184f.28bd88",
+        "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": 384.73819732666016,
+        "y": 76.44049263000488,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "c48beb19.71a678"
+            ]
+        ]
+    },
+    {
+        "id": "e77c3de3.2b2008",
+        "type": "switchNode",
+        "name": "switch vf-module-parameters.param_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 460.7500305175781,
+        "y": 1393.6191635131836,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "ed16c85f.fc48c8"
+            ]
+        ]
+    },
+    {
+        "id": "ed16c85f.fc48c8",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 720.7500610351562,
+        "y": 1393.6191635131836,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "b82561ca.f02328"
+            ]
+        ]
+    },
+    {
+        "id": "167f28dd.0f7caf",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:self-serve-vfmodule-ra-assignment",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vfmodule-ra-assignment' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1262.4643096923828,
+        "y": 1440.9049139022827,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "11acae54.f95aba"
+            ]
+        ]
+    },
+    {
+        "id": "db17de85.c633b8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 1743.1785507202148,
+        "y": 1440.4763174057007,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "550f157b.22aeb4",
+        "type": "for",
+        "name": "foreach vf-module-parameters.param[]",
+        "xml": "<for index='pidx' 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": 746.0359954833984,
+        "y": 1703.7977504730225,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "8bfdae81.64bc",
+                "44193b49.81625c"
+            ]
+        ]
+    },
+    {
+        "id": "3c32570b.4419e8",
+        "type": "set",
+        "name": "set ss.capability.execution-order[]",
+        "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
+        "comments": "",
+        "x": 432.91666412353516,
+        "y": 1255.6786432266235,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "a2418fcd.7da918",
+        "type": "for",
+        "name": "foreach capability-order[]",
+        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 401.6786193847656,
+        "y": 1559.6190433502197,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "81a43bcc.00994",
+                "5aa98964.70baf8",
+                "550f157b.22aeb4",
+                "b8e43d56.b9536"
+            ]
+        ]
+    },
+    {
+        "id": "8bfdae81.64bc",
+        "type": "switchNode",
+        "name": "switch capability-name param vs. execution",
+        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1112.4288177490234,
+        "y": 1749.4405431747437,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "e0d41e9c.3cc358"
+            ]
+        ]
+    },
+    {
+        "id": "e0d41e9c.3cc358",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1375.9288177490234,
+        "y": 1749.6905431747437,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "69b89942.138258"
+            ]
+        ]
+    },
+    {
+        "id": "11acae54.f95aba",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1589.0356559753418,
+        "y": 1440.3335075378418,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "db17de85.c633b8"
+            ]
+        ]
+    },
+    {
+        "id": "81a43bcc.00994",
+        "type": "set",
+        "name": "set ss.capability-name",
+        "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order\n-->",
+        "comments": "",
+        "x": 693.0356750488281,
+        "y": 1559.5714950561523,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "44193b49.81625c",
+        "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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n",
+        "comments": "",
+        "x": 1061.7858428955078,
+        "y": 1704.0477533340454,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "5aa98964.70baf8",
+        "type": "set",
+        "name": "set ss.capability-action = assign",
+        "xml": "<set>\n<parameter name='ss.capability-action' value='assign' />\n",
+        "comments": "",
+        "x": 723.7498168945312,
+        "y": 1606.488079071045,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "b8e43d56.b9536",
+        "type": "set",
+        "name": "set capability-dg with 'self-serve-' + capability-name",
+        "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
+        "comments": "",
+        "x": 786.0832824707031,
+        "y": 1655.1429500579834,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "af4cde5d.9f669",
+        "type": "set",
+        "name": "set sdnc-generated-cloud-resources = true",
+        "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.sdnc-generated-cloud-resources' \n\tvalue='true' />\n",
+        "comments": "",
+        "x": 1048.452392578125,
+        "y": 1142.1073188781738,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "69b89942.138258",
+        "type": "switchNode",
+        "name": "switch resource-resolution-data.status",
+        "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[$pidx].resource-resolution-data.status`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 492.0121765136719,
+        "y": 2278.2223148345947,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "c7c5dfa8.472188",
+                "c0428c78.ef2de8"
+            ]
+        ]
+    },
+    {
+        "id": "c7c5dfa8.472188",
+        "type": "other",
+        "name": "PENDING",
+        "xml": "<outcome value='PENDING'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 761.3693923950195,
+        "y": 2278.222270965576,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "a532ff1e.50cc18"
+            ]
+        ]
+    },
+    {
+        "id": "c0428c78.ef2de8",
+        "type": "other",
+        "name": "FAILED",
+        "xml": "<outcome value='FAILED'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 754.9052085876465,
+        "y": 2329.186601638794,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "a532ff1e.50cc18"
+            ]
+        ]
+    },
+    {
+        "id": "a532ff1e.50cc18",
+        "type": "call",
+        "name": "call ss.capability-dg",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 970.0239410400391,
+        "y": 2329.948452949524,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "2b08bc93.66d5e4"
+            ]
+        ]
+    },
+    {
+        "id": "2021ce71.5107f2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`\" />\n",
+        "comments": "",
+        "x": 1544.7142753601074,
+        "y": 2683.639304161072,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "2b08bc93.66d5e4",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1163.0592918395996,
+        "y": 2329.6627311706543,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "53e06cef.741024"
+            ]
+        ]
+    },
+    {
+        "id": "53e06cef.741024",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1326.333408355713,
+        "y": 2328.9722719192505,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "2021ce71.5107f2",
+                "71459a99.6f533c",
+                "66f8d8e5.abbdb",
+                "778431fc.00f0d8",
+                "c5d6ddf6.bd51a8",
+                "50d59713.d539c"
+            ]
+        ]
+    },
+    {
+        "id": "71459a99.6f533c",
+        "type": "execute",
+        "name": "execute RestApiCallNode - PUT vf-module",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-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-vfmodule\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1641.8808479309082,
+        "y": 2585.3462314605713,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "a46ae298.db94c",
+                "21f8b8f5.93aeb8"
+            ]
+        ]
+    },
+    {
+        "id": "a46ae298.db94c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1916.4745140075684,
+        "y": 2639.3443851470947,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "e270de80.3b03b"
+            ]
+        ]
+    },
+    {
+        "id": "21f8b8f5.93aeb8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1908.903148651123,
+        "y": 2585.8444051742554,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "e270de80.3b03b"
+            ]
+        ]
+    },
+    {
+        "id": "7163cb8f.b962f4",
+        "type": "execute",
+        "name": "printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vf-assign.log' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 344.25794219970703,
+        "y": 2830.373447418213,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d51ac9f8.4a305",
+        "type": "switchNode",
+        "name": "switch vf-module_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 398.7022895812988,
+        "y": 310.5119981765747,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "1ccbbcde.8d428b",
+                "dab73429.9634c8",
+                "b8b7c396.4422e8"
+            ]
+        ]
+    },
+    {
+        "id": "1ccbbcde.8d428b",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 611.3332595825195,
+        "y": 239.90478897094727,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "47daeaf3.14676c"
+            ]
+        ]
+    },
+    {
+        "id": "644c1a28.31d2ac",
+        "type": "set",
+        "name": "set vf-module-index=0",
+        "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",
+        "comments": "",
+        "x": 950.4522895812988,
+        "y": 250.8215742111206,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "dab73429.9634c8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 610.5118522644043,
+        "y": 378.6906490325928,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "1d0ff476.0237d4"
+            ]
+        ]
+    },
+    {
+        "id": "537df250.c3aa4c",
+        "type": "set",
+        "name": "set vf-module-id",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'\n   value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n",
+        "comments": "",
+        "x": 966.7379302978516,
+        "y": 532.9316177368164,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "657f87b6.cbfdd8",
+        "type": "set",
+        "name": "set vf-module-parameters",
+        "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.'\n  value='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.' />\n",
+        "comments": "",
+        "x": 1131.4285278320312,
+        "y": 1392.7744059562683,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "ecfbe016.6cb8a8",
+        "type": "set",
+        "name": "set order-status to PendingCreate",
+        "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-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.request-information.request-action`' />\n",
+        "comments": "",
+        "x": 1021.0121002197266,
+        "y": 1094.7948169708252,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "66f8d8e5.abbdb",
+        "type": "set",
+        "name": "set vf data for restapi-call-node",
+        "xml": "<set>\n<parameter name='vf.vf-module-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\n<parameter name='vf.vf-module-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\n<parameter name='vf.vf-module-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\n<parameter name='vf.vf-module-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\n<parameter name='vf.vf-module-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\n<parameter name='vf.vf-module-data.vf-module-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\n<parameter name='vf.vf-module-data.vf-module-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\n<parameter name='vf.vf-module-data.vf-module-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />",
+        "comments": "",
+        "x": 1603.3928718566895,
+        "y": 2329.4642486572266,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "778431fc.00f0d8",
+        "type": "execute",
+        "name": "generate ss-vfmodule 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-vfmodule-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1669.6428184509277,
+        "y": 2377.4642934799194,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c5d6ddf6.bd51a8",
+        "type": "execute",
+        "name": "generate ss-vfmodule url - replace vnf-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1633.9285163879395,
+        "y": 2425.5232105255127,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "50d59713.d539c",
+        "type": "execute",
+        "name": "generate ss-vfmodule url - replace vf-module-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1655.8691902160645,
+        "y": 2475.4397106170654,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9228bdc2.01422",
+        "type": "set",
+        "name": "set ss.capability-type = vf-module",
+        "xml": "<set>\n<parameter name='ss.capability-type' value='vf-module' />\n",
+        "comments": "",
+        "x": 433.8214569091797,
+        "y": 1212.6786012649536,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "b82561ca.f02328",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 896.107153756278,
+        "y": 1393.499975476946,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "657f87b6.cbfdd8",
+                "167f28dd.0f7caf"
+            ]
+        ]
+    },
+    {
+        "id": "462e6ed1.1f6e98",
+        "type": "set",
+        "name": "set is-new-vfmodule = true",
+        "xml": "<set>\n<parameter name='is-new-vfmodule' value='true' />\n",
+        "comments": "",
+        "x": 405.5239715576172,
+        "y": 190.92872047424316,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "7b834bf8.2ecde4",
+        "type": "for",
+        "name": "for each existing VF module",
+        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 969.3452301025391,
+        "y": 378.3809871673584,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "bddb9f56.b540e"
+            ]
+        ]
+    },
+    {
+        "id": "bddb9f56.b540e",
+        "type": "switchNode",
+        "name": "switch vf-module-id: input vs service-data",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1280.4643630981445,
+        "y": 378.95240211486816,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "3c84c1f4.0d55ee"
+            ]
+        ]
+    },
+    {
+        "id": "3c84c1f4.0d55ee",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1534.3333930969238,
+        "y": 378.77385902404785,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "b961c23.6df454"
+            ]
+        ]
+    },
+    {
+        "id": "4a7f42d7.016684",
+        "type": "set",
+        "name": "set is-new-vfmodule = false",
+        "xml": "<set>\n<parameter name='is-new-vfmodule' value='false' />\n",
+        "comments": "",
+        "x": 1906.5001335144043,
+        "y": 378.0357475280762,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "b961c23.6df454",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1675.7501373291016,
+        "y": 378.2857437133789,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "4a7f42d7.016684",
+                "6b00168d.69aa58",
+                "6d8b036e.192174"
+            ]
+        ]
+    },
+    {
+        "id": "6b00168d.69aa58",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 1843.6429252624512,
+        "y": 464.28572177886963,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "6d8b036e.192174",
+        "type": "set",
+        "name": "set vf-module-index = idx",
+        "xml": "<set>\n<parameter name='vf-module-index' value='`$idx`' />\n",
+        "comments": "",
+        "x": 1899.4644470214844,
+        "y": 421.32140254974365,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "c04fc421.1fa08",
+        "type": "set",
+        "name": "set new vf-module_length = vf-module-index + 1",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n",
+        "comments": "",
+        "x": 1031.8097114562988,
+        "y": 292.1430025100708,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "1d0ff476.0237d4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 747.6667671203613,
+        "y": 379.0715112686157,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "aba5ad0b.d08a6",
+                "7b834bf8.2ecde4"
+            ]
+        ]
+    },
+    {
+        "id": "9970993.9b5e368",
+        "type": "set",
+        "name": "set new vf-module_length++",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length + 1`' />\n",
+        "comments": "",
+        "x": 1516.916790008545,
+        "y": 490.8215160369873,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "aba5ad0b.d08a6",
+        "type": "switchNode",
+        "name": "switch is-new-vfmodule",
+        "xml": "<switch test='`$is-new-vfmodule`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 955.1667633056641,
+        "y": 448.6428909301758,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "6a98da26.1c8fec"
+            ]
+        ]
+    },
+    {
+        "id": "6a98da26.1c8fec",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1153.0239181518555,
+        "y": 448.2143383026123,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "569ebbe2.83090c"
+            ]
+        ]
+    },
+    {
+        "id": "47daeaf3.14676c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 754.1667633056641,
+        "y": 271.5715055465698,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "c04fc421.1fa08",
+                "644c1a28.31d2ac"
+            ]
+        ]
+    },
+    {
+        "id": "b8b7c396.4422e8",
+        "type": "other",
+        "name": "0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 612.5,
+        "y": 310,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "47daeaf3.14676c"
+            ]
+        ]
+    },
+    {
+        "id": "ef66a16f.622d48",
+        "type": "switchNode",
+        "name": "switch is-new-vfmodule",
+        "xml": "<switch test='`$is-new-vfmodule`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 398.25,
+        "y": 533.75,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "8797ff7f.0ab87"
+            ]
+        ]
+    },
+    {
+        "id": "8797ff7f.0ab87",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 596.1071548461914,
+        "y": 533.3214473724365,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "43f1864.5d3a0f8"
+            ]
+        ]
+    },
+    {
+        "id": "cdadece8.6ad91",
+        "type": "set",
+        "name": "Copy vf-module-topology 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-topology-identifier.vf-module-id' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\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-topology-identifier.vf-module-name' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-type' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.tenant' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-cloud-region' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli'\n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-clli`' />",
+        "comments": "",
+        "x": 1012.0000152587891,
+        "y": 578.7500696182251,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "8d9a316.a485fd",
+        "type": "set",
+        "name": "set from DB",
+        "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.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n",
+        "comments": "",
+        "x": 1377.011775970459,
+        "y": 631.193510055542,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "f413ec38.7eb0d8",
+        "type": "switchNode",
+        "name": "switch input model-invariant-uuid",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1020.8688507080078,
+        "y": 654.0179538726807,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "75cbae54.704e8",
+                "25839834.a62618"
+            ]
+        ]
+    },
+    {
+        "id": "75cbae54.704e8",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1226.5355224609375,
+        "y": 631.1609172821045,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "8d9a316.a485fd"
+            ]
+        ]
+    },
+    {
+        "id": "25839834.a62618",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1227.9641189575195,
+        "y": 675.4465084075928,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "d5553901.d524c"
+            ]
+        ]
+    },
+    {
+        "id": "d5553901.d524c",
+        "type": "set",
+        "name": "set from input",
+        "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.onap-model-information.model-invariant-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n",
+        "comments": "",
+        "x": 1382.249855041504,
+        "y": 674.8750805854797,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "c794a142.21cde",
+        "type": "set",
+        "name": "set from DB",
+        "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.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n",
+        "comments": "",
+        "x": 1377.9640464782715,
+        "y": 719.7321863174438,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "6edcc0fe.2ad32",
+        "type": "switchNode",
+        "name": "switch input model-uuid",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 993.4878692626953,
+        "y": 742.5566911697388,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "48396253.c942dc",
+                "5fadd2d0.095abc"
+            ]
+        ]
+    },
+    {
+        "id": "48396253.c942dc",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1227.4878425598145,
+        "y": 719.6996231079102,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "c794a142.21cde"
+            ]
+        ]
+    },
+    {
+        "id": "5fadd2d0.095abc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1228.9164390563965,
+        "y": 763.9852142333984,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "dfd24e14.2a853"
+            ]
+        ]
+    },
+    {
+        "id": "dfd24e14.2a853",
+        "type": "set",
+        "name": "set from input",
+        "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.onap-model-information.model-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n",
+        "comments": "",
+        "x": 1383.2021751403809,
+        "y": 763.4137864112854,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "9a10da1.265cb28",
+        "type": "set",
+        "name": "set from DB",
+        "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.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n",
+        "comments": "",
+        "x": 1369.1069793701172,
+        "y": 808.5893936157227,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "16ab5c0.0baaca4",
+        "type": "switchNode",
+        "name": "switch input model-version",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 995.6307411193848,
+        "y": 831.4138383865356,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "2b66c81d.1e7bc",
+                "a5f530d.fa7e45"
+            ]
+        ]
+    },
+    {
+        "id": "2b66c81d.1e7bc",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1218.6307258605957,
+        "y": 808.5568008422852,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "9a10da1.265cb28"
+            ]
+        ]
+    },
+    {
+        "id": "a5f530d.fa7e45",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1220.0593223571777,
+        "y": 852.8423919677734,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "cf885c5a.c0588"
+            ]
+        ]
+    },
+    {
+        "id": "cf885c5a.c0588",
+        "type": "set",
+        "name": "set from input",
+        "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.onap-model-information.model-version'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n",
+        "comments": "",
+        "x": 1374.345058441162,
+        "y": 852.2709641456604,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "6078d5ec.339204",
+        "type": "set",
+        "name": "set from DB",
+        "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.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n",
+        "comments": "",
+        "x": 1369.1069793701172,
+        "y": 895.7322158813477,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "a2e575a9.65814",
+        "type": "switchNode",
+        "name": "switch input model-name",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 992.6307411193848,
+        "y": 918.5566606521606,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "89386a5a.8b7548",
+                "4234f708.5c303"
+            ]
+        ]
+    },
+    {
+        "id": "89386a5a.8b7548",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1218.6307258605957,
+        "y": 895.6996231079102,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "6078d5ec.339204"
+            ]
+        ]
+    },
+    {
+        "id": "4234f708.5c303",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1220.0593223571777,
+        "y": 939.9852142333984,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "4ae2b1d.2090e5"
+            ]
+        ]
+    },
+    {
+        "id": "4ae2b1d.2090e5",
+        "type": "set",
+        "name": "set from input",
+        "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.onap-model-information.model-name'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`' />\n",
+        "comments": "",
+        "x": 1374.345058441162,
+        "y": 939.4137864112854,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "2db84f30.cebb7",
+        "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.onap-model-information.model-customization-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n",
+        "comments": "",
+        "x": 1006.0830993652344,
+        "y": 992.4941453933716,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "bc2d0f7c.869738",
+        "type": "set",
+        "name": "copy input data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.' \n    value='$vf-module-topology-operation-input.vf-module-request-input.' />",
+        "comments": "",
+        "x": 962.7381744384766,
+        "y": 1047.1788482666016,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "43f1864.5d3a0f8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 752.2024154663086,
+        "y": 533.0991916656494,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "f413ec38.7eb0d8",
+                "6edcc0fe.2ad32",
+                "16ab5c0.0baaca4",
+                "a2e575a9.65814",
+                "2db84f30.cebb7",
+                "bc2d0f7c.869738",
+                "cdadece8.6ad91",
+                "537df250.c3aa4c",
+                "ecfbe016.6cb8a8",
+                "af4cde5d.9f669"
+            ]
+        ]
+    },
+    {
+        "id": "896850ac.e5c6d8",
+        "type": "set",
+        "name": "set vf-module-index = vf-module_length",
+        "xml": "<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",
+        "comments": "",
+        "x": 1549.5000190734863,
+        "y": 447.00000762939453,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    },
+    {
+        "id": "569ebbe2.83090c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1296.0000190734863,
+        "y": 447.75000762939453,
+        "z": "2ac4dd98.962cc2",
+        "wires": [
+            [
+                "896850ac.e5c6d8",
+                "9970993.9b5e368"
+            ]
+        ]
+    },
+    {
+        "id": "e270de80.3b03b",
+        "type": "set",
+        "name": "set error-message",
+        "xml": "<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vf-module assignments during assign in MD-SAL\" />",
+        "comments": "",
+        "x": 2128.214286804199,
+        "y": 2585.6784229278564,
+        "z": "2ac4dd98.962cc2",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
index 0547a35f..179abd0c 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
@@ -152,8 +152,7 @@
     "id": "57aa1f79.ff47b",
     "type": "set",
     "name": "set ss.capability.execution-order[]",
-    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter
-name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
+    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
     "comments": "",
     "x": 414.1905059814453,
     "y": 1241.0001363754272,
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 719d009b..294ce772 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
@@ -1,6 +1,6 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1.4.1-SNAPSHOT'>
+    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>
@@ -107,9 +107,6 @@
                                                     <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`' >
                                                     <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' >
@@ -129,9 +126,14 @@
                                                                     </execute>
                                                                     <switch test='`$s2[0] == $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`" />
-                                                                            </set>
+                                                                            <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>
@@ -231,9 +233,6 @@
                                                     <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='SUCCESS' />
-                                                </set>
                                                 <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' >
@@ -253,9 +252,14 @@
                                                                     </execute>
                                                                     <switch test='`$s2[0] == $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`" />
-                                                                            </set>
+                                                                            <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>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
index 7ef78f6c..adbe98d8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
@@ -1,6 +1,6 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1.4.1-SNAPSHOT'>
+    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-netbox-ip-assign' mode='sync'>
         <block atomic="true">
             <switch test='`$ss.capability-name`'>
@@ -30,266 +30,538 @@
                     </return>
                 </outcome>
             </call>
-            <block>
-                <for index="pidx" 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`">
-                    <set>
-                        <parameter name='tmp.ss.param.capability-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[$pidx].resource-resolution-data.capability-name`' />
-                    </set>
-                    <set>
-                        <parameter name='tmp.ss.param.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[$pidx].name`' />
-                    </set>
-                    <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
-                        <outcome value='true'>
-                            <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[$pidx].resource-resolution-data.status`'>
-                                <outcome value='FAILED'>
-                                    <block>
-                                        <for index="kidx" 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[$pidx].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[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
-                                                <outcome value='service-instance-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.service-instance-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='vf-module-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.vf-module-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='prefix-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.prefix-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='ip-address-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.ip-address-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='external_key'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.external-key' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                        </for>
-                                        <switch test='`$ss.capability-action`'>
-                                            <outcome value='assign'>
-                                                <block atomic='true'>
-                                                    <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
-                                                        <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
-                                                        <parameter name="vf_module_id" value="`$tmp.ss.vf-module-id`" />
-                                                        <parameter name="prefix_id" value="`$tmp.ss.prefix-id`" />
-                                                        <parameter name="resource_name" value="`$tmp.ss.param.name`" />
-                                                        <parameter name="external_key" value="`$tmp.ss.external-key`" />
-                                                        <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[$pidx].resource-resolution-data.status' value='FAILED' />
-                                                                </set>
-                                                                <return status='failure'>
-                                                                    <parameter name='error-code' value='' />
-                                                                    <parameter name='error-message' value='' />
-                                                                </return>
-                                                            </block>
+            <switch test="`$ss.capability-type == 'vnf'`">
+                <outcome value='true'>
+                    <block>
+                        <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                            <set>
+                                <parameter name='tmp.ss.param.capability-name' 
+	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />
+                            </set>
+                            <set>
+                                <parameter name='tmp.ss.param.name' 
+	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].name`' />
+                            </set>
+                            <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+                                        <outcome value='FAILED'>
+                                            <block>
+                                                <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`">
+                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
+                                                        <outcome value='service-instance-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
                                                         </outcome>
-                                                        <outcome value='success'>
-                                                            <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[$pidx].value' 
-	value='`$self_serve_netbox_ip_assignement.ip-address`' />
-                                                                </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[$pidx].resource-resolution-data.status' 
-	value='SUCCESS' />
-                                                                </set>
-                                                            </block>
+                                                        <outcome value='vnf-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
                                                         </outcome>
-                                                    </execute>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='unassign'>
-                                                <block atomic="true">
-                                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+                                                        <outcome value='prefix-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='external_key'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                                <switch test='`$ss.capability-action`'>
+                                                    <outcome value='assign'>
+                                                        <block atomic='true'>
+                                                            <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
+                                                                <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                <parameter name="vf_module_id" value="`$tmp.ss.vnf-id`" />
+                                                                <parameter name="prefix_id" value="`$tmp.ss.prefix-id`" />
+                                                                <parameter name="resource_name" value="`$tmp.ss.param.name`" />
+                                                                <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                <outcome value='failure'>
+                                                                    <block atomic='true'>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' value='FAILED' />
+                                                                        </set>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
+                                                                        </return>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value="`$self_serve_netbox_ip_assignement.ip-address`" />
+                                                                            <parameter name="regex" value="/"/>
+                                                                            <parameter name="ctx_memory_result_key" value="ip" />
+                                                                        </execute>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].value' 
+	value='`$ip[0]`' />
+                                                                        </set>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' 
+	value='SUCCESS' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </execute>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='unassign'>
+                                                        <block atomic="true">
+                                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
 	key='SELECT * from IPAM_IP_ASSIGNEMENT 
 		WHERE external_key = $tmp.ss.external-key
 		AND service_instance_id = $tmp.ss.service-instance-id' >
-                                                        <outcome value='not-found'>
-                                                            <block></block>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='tmp.status' value="PENDING_DELETE" />
-                                                                </set>
-                                                                <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
+                                                                <outcome value='not-found'>
+                                                                    <block></block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.status' value="PENDING_DELETE" />
+                                                                        </set>
+                                                                        <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
 	key="UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status 
 		WHERE external_key = $tmp.ss.external-key
 		AND service_instance_id = $tmp.ss.service-instance-id" >
-                                                                    <outcome value='failure'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </update>
-                                                                <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
-                                                                    <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
-                                                                    <parameter name="external_key" value="`$tmp.ss.external-key`" />
-                                                                    <outcome value='failure'>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </update>
+                                                                        <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
+                                                                            <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                            <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <set>
+                                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                    </block>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='PENDING'>
+                                            <block>
+                                                <for index="kidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key_length`">
+                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
+                                                        <outcome value='service-instance-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='vnf-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='prefix-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='external_key'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                                <switch test='`$ss.capability-action`'>
+                                                    <outcome value='assign'>
+                                                        <block atomic='true'>
+                                                            <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
+                                                                <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                <parameter name="vf_module_id" value="`$tmp.ss.vnf-id`" />
+                                                                <parameter name="prefix_id" value="`$tmp.ss.prefix-id`" />
+                                                                <parameter name="resource_name" value="`$tmp.ss.param.name`" />
+                                                                <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                <outcome value='failure'>
+                                                                    <block atomic='true'>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].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 in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
                                                                         </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value="`$self_serve_netbox_ip_assignement.ip-address`" />
+                                                                            <parameter name="regex" value="/"/>
+                                                                            <parameter name="ctx_memory_result_key" value="ip" />
+                                                                        </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[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].value' 
+	value='`$ip[0]`' />
                                                                         </set>
-                                                                    </outcome>
-                                                                </execute>
-                                                            </block>
-                                                        </outcome>
-                                                    </get-resource>
-                                                </block>
-                                            </outcome>
-                                        </switch>
-                                    </block>
-                                </outcome>
-                                <outcome value='PENDING'>
-                                    <block>
-                                        <for index="kidx" 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[$pidx].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[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
-                                                <outcome value='service-instance-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.service-instance-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='vf-module-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.vf-module-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='prefix-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.prefix-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='ip-address-id'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.ip-address-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='external_key'>
-                                                    <set>
-                                                        <parameter name='tmp.ss.external-key' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                        </for>
-                                        <switch test='`$ss.capability-action`'>
-                                            <outcome value='assign'>
-                                                <block atomic='true'>
-                                                    <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
-                                                        <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
-                                                        <parameter name="vf_module_id" value="`$tmp.ss.vf-module-id`" />
-                                                        <parameter name="prefix_id" value="`$tmp.ss.prefix-id`" />
-                                                        <parameter name="resource_name" value="`$tmp.ss.param.name`" />
-                                                        <parameter name="external_key" value="`$tmp.ss.external-key`" />
-                                                        <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[$pidx].resource-resolution-data.status' value='FAILED' />
-                                                                </set>
-                                                                <return status='failure'>
-                                                                    <parameter name='error-code' value='' />
-                                                                    <parameter name='error-message' value='' />
-                                                                </return>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <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[$pidx].value' 
-	value='`$self_serve_netbox_ip_assignement.ip-address`' />
-                                                                </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[$pidx].resource-resolution-data.status' 
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' 
 	value='SUCCESS' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='unassign'>
-                                                <block atomic="true">
-                                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </execute>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='unassign'>
+                                                        <block atomic="true">
+                                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
 	key='SELECT * from IPAM_IP_ASSIGNEMENT 
 		WHERE external_key = $tmp.ss.external-key
 		AND service_instance_id = $tmp.ss.service-instance-id' >
-                                                        <outcome value='not-found'>
-                                                            <block></block>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='tmp.status' value="PENDING_DELETE" />
-                                                                </set>
-                                                                <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
+                                                                <outcome value='not-found'>
+                                                                    <block></block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.status' value="PENDING_DELETE" />
+                                                                        </set>
+                                                                        <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
 	key="UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status 
 		WHERE external_key = $tmp.ss.external-key
 		AND service_instance_id = $tmp.ss.service-instance-id" >
-                                                                    <outcome value='failure'>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </update>
+                                                                        <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
+                                                                            <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                            <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <set>
+                                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                    </block>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                            <parameter name="logger" value="message-log"/>
+                            <parameter name="field1" value="__TIMESTAMP__"/>
+                            <parameter name="field2" value="`'SS: pidx: ' + $pidx`"/>
+                        </record>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test="`$ss.capability-type == 'vf-module'`">
+                <outcome value='true'>
+                    <block>
+                        <for index="pidx" 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`">
+                            <set>
+                                <parameter name='tmp.ss.param.capability-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[$pidx].resource-resolution-data.capability-name`' />
+                            </set>
+                            <set>
+                                <parameter name='tmp.ss.param.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[$pidx].name`' />
+                            </set>
+                            <switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>
+                                <outcome value='true'>
+                                    <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[$pidx].resource-resolution-data.status`'>
+                                        <outcome value='FAILED'>
+                                            <block>
+                                                <for index="kidx" 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[$pidx].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[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
+                                                        <outcome value='service-instance-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.service-instance-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='vf-module-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.vf-module-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='prefix-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.prefix-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='ip-address-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.ip-address-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='external_key'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.external-key' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                                <switch test='`$ss.capability-action`'>
+                                                    <outcome value='assign'>
+                                                        <block atomic='true'>
+                                                            <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
+                                                                <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                <parameter name="vf_module_id" value="`$tmp.ss.vf-module-id`" />
+                                                                <parameter name="prefix_id" value="`$tmp.ss.prefix-id`" />
+                                                                <parameter name="resource_name" value="`$tmp.ss.param.name`" />
+                                                                <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                <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[$pidx].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 updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
                                                                         </return>
-                                                                    </outcome>
-                                                                </update>
-                                                                <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
-                                                                    <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
-                                                                    <parameter name="external_key" value="`$tmp.ss.external-key`" />
-                                                                    <outcome value='failure'>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value="`$self_serve_netbox_ip_assignement.ip-address`" />
+                                                                            <parameter name="regex" value="/"/>
+                                                                            <parameter name="ctx_memory_result_key" value="ip" />
+                                                                        </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[$pidx].value' 
+	value='`$ip[0]`' />
+                                                                        </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[$pidx].resource-resolution-data.status' 
+	value='SUCCESS' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </execute>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='unassign'>
+                                                        <block atomic="true">
+                                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+	key='SELECT * from IPAM_IP_ASSIGNEMENT 
+		WHERE external_key = $tmp.ss.external-key
+		AND service_instance_id = $tmp.ss.service-instance-id' >
+                                                                <outcome value='not-found'>
+                                                                    <block></block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.status' value="PENDING_DELETE" />
+                                                                        </set>
+                                                                        <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
+	key="UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status 
+		WHERE external_key = $tmp.ss.external-key
+		AND service_instance_id = $tmp.ss.service-instance-id" >
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </update>
+                                                                        <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
+                                                                            <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                            <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <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[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                    </block>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='PENDING'>
+                                            <block>
+                                                <for index="kidx" 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[$pidx].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[$pidx].resource-resolution-data.resource-key[$kidx].name`'>
+                                                        <outcome value='service-instance-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.service-instance-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='vf-module-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.vf-module-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='prefix-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.prefix-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='ip-address-id'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.ip-address-id' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='external_key'>
+                                                            <set>
+                                                                <parameter name='tmp.ss.external-key' 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[$pidx].resource-resolution-data.resource-key[$kidx].value`' />
+                                                            </set>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                                <switch test='`$ss.capability-action`'>
+                                                    <outcome value='assign'>
+                                                        <block atomic='true'>
+                                                            <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="assignIpAddress">
+                                                                <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                <parameter name="vf_module_id" value="`$tmp.ss.vf-module-id`" />
+                                                                <parameter name="prefix_id" value="`$tmp.ss.prefix-id`" />
+                                                                <parameter name="resource_name" value="`$tmp.ss.param.name`" />
+                                                                <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                <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[$pidx].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 in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
                                                                         </return>
-                                                                    </outcome>
-                                                                    <outcome value='success'>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value="`$self_serve_netbox_ip_assignement.ip-address`" />
+                                                                            <parameter name="regex" value="/"/>
+                                                                            <parameter name="ctx_memory_result_key" value="ip" />
+                                                                        </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[$pidx].value' 
+	value='`$ip[0]`' />
+                                                                        </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[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
+	value='SUCCESS' />
                                                                         </set>
-                                                                    </outcome>
-                                                                </execute>
-                                                            </block>
-                                                        </outcome>
-                                                    </get-resource>
-                                                </block>
-                                            </outcome>
-                                        </switch>
-                                    </block>
+                                                                    </block>
+                                                                </outcome>
+                                                            </execute>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='unassign'>
+                                                        <block atomic="true">
+                                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+	key='SELECT * from IPAM_IP_ASSIGNEMENT 
+		WHERE external_key = $tmp.ss.external-key
+		AND service_instance_id = $tmp.ss.service-instance-id' >
+                                                                <outcome value='not-found'>
+                                                                    <block></block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.status' value="PENDING_DELETE" />
+                                                                        </set>
+                                                                        <update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
+	key="UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status 
+		WHERE external_key = $tmp.ss.external-key
+		AND service_instance_id = $tmp.ss.service-instance-id" >
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </update>
+                                                                        <execute plugin="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient" method="unassignIpAddress">
+                                                                            <parameter name="service_instance_id" value="`$tmp.ss.service-instance-id`" />
+                                                                            <parameter name="external_key" value="`$tmp.ss.external-key`" />
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <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[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                                </set>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                    </block>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                    </switch>
                                 </outcome>
                             </switch>
-                        </outcome>
-                    </switch>
-                </for>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                    <parameter name="logger" value="message-log"/>
-                    <parameter name="field1" value="__TIMESTAMP__"/>
-                    <parameter name="field2" value="`'SS: pidx: ' + $pidx`"/>
-                </record>
-            </block>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss.eipam.log' />
-            </execute>
+                        </for>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                            <parameter name="logger" value="message-log"/>
+                            <parameter name="field1" value="__TIMESTAMP__"/>
+                            <parameter name="field2" value="`'SS: pidx: ' + $pidx`"/>
+                        </record>
+                    </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-vf-module-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index e39ba78e..5b15d653 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
@@ -161,7 +161,7 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'
-  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
+  value='`$vf-module-topology-operation-input.request-information.request-action`' />
                         </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.sdnc-generated-cloud-resources' 
-- 
cgit 1.2.3-korg