From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 5 Oct 2018 18:57:15 +0000 (-0400)
Subject: Add silentFailure on loop for ss-generate-name
X-Git-Tag: 1.4.1~2^2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=af8a3c1cf786eade26d6c00ba267f495c83bf3db;hp=07b6f6d67871b0341b4647b976e09852607d9126;p=sdnc%2Foam.git

Add silentFailure on loop for ss-generate-name

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

Former-commit-id: 4f4e5f034ac230e6760b10ef8bd21dc980212753
---

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 2d05912d..76a1a697 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,2902 @@
 [
     {
-        "id": "44384001.814478",
+        "id": "4715fedb.1ef5f",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 112,
-        "y": 43,
-        "z": "b88526e.24a7ad8",
+        "x": 96,
+        "y": 44,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7f8a6cfc.d713c4"
+                "16eecbde.63796c"
             ]
         ]
     },
     {
-        "id": "7f8a6cfc.d713c4",
+        "id": "16eecbde.63796c",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "name": "GENERIC-RESOURCE-API 1.4.1-SNAPSHOT",
         "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
+        "version": "1.4.1-SNAPSHOT",
         "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}'>",
+        "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'>",
         "outputs": 1,
-        "x": 359.1428527832031,
-        "y": 43.99999237060547,
-        "z": "b88526e.24a7ad8",
+        "x": 344.5713806152344,
+        "y": 46.428558349609375,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "3e607973.034d6e"
+                "3e4b7e7e.935232"
             ]
         ]
     },
     {
-        "id": "3e607973.034d6e",
+        "id": "3e4b7e7e.935232",
         "type": "method",
         "name": "self-serve-generate-name",
         "xml": "<method rpc='self-serve-generate-name' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 664.1428527832031,
-        "y": 43.99999237060547,
-        "z": "b88526e.24a7ad8",
+        "x": 648.1428527832031,
+        "y": 44.99999237060547,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "3f9a35f8.8da52a"
+                "3835d554.5600ca"
             ]
         ]
     },
     {
-        "id": "3f9a35f8.8da52a",
+        "id": "3835d554.5600ca",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 163.14285278320312,
-        "y": 129.99999237060547,
-        "z": "b88526e.24a7ad8",
+        "x": 147.14285278320312,
+        "y": 130.99999237060547,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7a632215.c0ac2c",
-                "7f9a3712.0790f",
-                "f841aff3.13a07",
-                "571f0673.b8518",
-                "2a352877.19cd9"
+                "cbd7c4ae.654d68",
+                "7bb73832.6a4648",
+                "4b1c4a05.4570ec",
+                "324d6ccc.ba650c",
+                "5c83d412.2769f4"
             ]
         ]
     },
     {
-        "id": "bc633e83.bdfe98",
+        "id": "3a4d4bdb.4c43d4",
         "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": 1728.8572082519531,
-        "y": 856.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1712.8572082519531,
+        "y": 857.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a632215.c0ac2c",
+        "id": "cbd7c4ae.654d68",
         "type": "set",
         "name": "set capability-name",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
         "comments": "",
-        "x": 362.1428527832031,
-        "y": 130.99999237060547,
-        "z": "b88526e.24a7ad8",
+        "x": 346.1428527832031,
+        "y": 131.99999237060547,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "7f9a3712.0790f",
+        "id": "7bb73832.6a4648",
         "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": 391.1428527832031,
-        "y": 222,
-        "z": "b88526e.24a7ad8",
+        "x": 375.1428527832031,
+        "y": 223,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "f5bead73.e939c8",
-                "e210e97d.997518"
+                "ea0f354c.745cc8",
+                "48698225.83a23c"
             ]
         ]
     },
     {
-        "id": "f5e94169.5fc978",
+        "id": "44cc33ed.fb39e4",
         "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": 1162.6430053710938,
-        "y": 487.4285125732422,
-        "z": "b88526e.24a7ad8",
+        "x": 1146.6430053710938,
+        "y": 488.4285125732422,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "fa4257ae.9fd718"
+                "e2d651ce.c9d9f8"
             ]
         ]
     },
     {
-        "id": "fa4257ae.9fd718",
+        "id": "e2d651ce.c9d9f8",
         "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": 1405.5000610351562,
-        "y": 487.4285125732422,
-        "z": "b88526e.24a7ad8",
+        "x": 1389.5000610351562,
+        "y": 488.4285125732422,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "4a6ecd53.d56884"
+                "8eb45c00.aa654"
             ]
         ]
     },
     {
-        "id": "4a6ecd53.d56884",
+        "id": "8eb45c00.aa654",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1586.2144165039062,
-        "y": 487.4284973144531,
-        "z": "b88526e.24a7ad8",
+        "x": 1570.2144165039062,
+        "y": 488.4284973144531,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "a7c641d6.1516b"
+                "4c47b1b9.3083"
             ]
         ]
     },
     {
-        "id": "9750b026.40e79",
+        "id": "83de20b7.804778",
         "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": 1698.3572082519531,
-        "y": 657.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1682.3572082519531,
+        "y": 658.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "6e26ff1a.e07b88"
+                "2a82f8ce.16638"
             ]
         ]
     },
     {
-        "id": "f5bead73.e939c8",
+        "id": "ea0f354c.745cc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 614.1428527832031,
-        "y": 190,
-        "z": "b88526e.24a7ad8",
+        "x": 598.1428527832031,
+        "y": 191,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "322435c8.51411a"
+                "cad21146.cbc7e8"
             ]
         ]
     },
     {
-        "id": "e210e97d.997518",
+        "id": "48698225.83a23c",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 623.1428527832031,
-        "y": 256,
-        "z": "b88526e.24a7ad8",
+        "x": 607.1428527832031,
+        "y": 257,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "322435c8.51411a"
+                "cad21146.cbc7e8"
             ]
         ]
     },
     {
-        "id": "322435c8.51411a",
+        "id": "cad21146.cbc7e8",
         "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": 816.1428527832031,
-        "y": 190,
-        "z": "b88526e.24a7ad8",
+        "x": 800.1428527832031,
+        "y": 191,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "11ec24e5.5f86b3",
+        "id": "9332f863.29e018",
         "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": 2300.857208251953,
-        "y": 655.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2284.857208251953,
+        "y": 656.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "bc87beaf.bad8a",
+        "id": "26b1ee2d.08273a",
         "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": 1695.8573608398438,
-        "y": 582.9998626708984,
-        "z": "b88526e.24a7ad8",
+        "x": 1679.8573608398438,
+        "y": 583.9998626708984,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "3b24af37.62d288",
+        "id": "626a201b.d55578",
         "type": "set",
         "name": "set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
         "comments": "",
-        "x": 1695.8572082519531,
-        "y": 719.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1679.8572082519531,
+        "y": 720.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "a94779d8.6d99c",
+        "id": "749d681a.41547",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1701.8572082519531,
-        "y": 784.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1685.8572082519531,
+        "y": 785.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "349803e.db927fc",
+        "id": "212189e2.756db6",
         "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": 1731.8572082519531,
-        "y": 910.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1715.8572082519531,
+        "y": 911.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8af1d548.36ba08",
+        "id": "e1ab56a7.feeeb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2097.857177734375,
-        "y": 932.1427612304688,
-        "z": "b88526e.24a7ad8",
+        "x": 2081.857177734375,
+        "y": 933.1427612304688,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c7e4d145.feb3b8"
+                "9997d3e2.8f70c"
             ]
         ]
     },
     {
-        "id": "91f543dc.e9a0c8",
+        "id": "d0532823.04f01",
         "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": 2462.857177734375,
-        "y": 1032.1427612304688,
-        "z": "b88526e.24a7ad8",
+        "x": 2446.857177734375,
+        "y": 1033.1427612304688,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "6b5d2c36.36d07c",
+        "id": "7a8d9826.51e62",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2102.857177734375,
-        "y": 1031.1427612304688,
-        "z": "b88526e.24a7ad8",
+        "x": 2086.857177734375,
+        "y": 1032.1427612304688,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c7e4d145.feb3b8"
+                "9997d3e2.8f70c"
             ]
         ]
     },
     {
-        "id": "c7e4d145.feb3b8",
+        "id": "9997d3e2.8f70c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2260.857177734375,
-        "y": 976.1427612304688,
-        "z": "b88526e.24a7ad8",
+        "x": 2244.857177734375,
+        "y": 977.1427612304688,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "6effc421.de541c",
-                "91f543dc.e9a0c8"
+                "d17f42c9.165b2",
+                "d0532823.04f01"
             ]
         ]
     },
     {
-        "id": "6effc421.de541c",
+        "id": "d17f42c9.165b2",
         "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": 2476.857177734375,
-        "y": 923.1427612304688,
-        "z": "b88526e.24a7ad8",
+        "x": 2460.857177734375,
+        "y": 924.1427612304688,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "4312cb34.d1fec4",
+        "id": "2c3347a4.1d0d28",
         "type": "switchNode",
         "name": "switch capability action assign",
         "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 786.3809204101562,
-        "y": 1614.7618560791016,
-        "z": "b88526e.24a7ad8",
+        "x": 770.3809204101562,
+        "y": 1615.7618560791016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c588e672.9457"
+                "be36dff5.5c2408"
             ]
         ]
     },
     {
-        "id": "c588e672.9457",
+        "id": "be36dff5.5c2408",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1041.0951538085938,
-        "y": 1614.7618560791016,
-        "z": "b88526e.24a7ad8",
+        "x": 1025.0951538085938,
+        "y": 1615.7618560791016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "96d8122d.bb415"
+                "1d187540.6f1cc3"
             ]
         ]
     },
     {
-        "id": "f5ff6d86.dbc2a8",
+        "id": "601689b5.f1fb7",
         "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": 1943.8572082519531,
-        "y": 1212.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1927.8572082519531,
+        "y": 1213.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "9f1d9384.e4cf38"
+                "c8739969.39695"
             ]
         ]
     },
     {
-        "id": "e8412a7e.3847d8",
+        "id": "a8ca1153.971238",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2146.857208251953,
-        "y": 1430.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2130.857208251953,
+        "y": 1431.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "32086d42.08bf12"
+                "ae4f2855.b375a8"
             ]
         ]
     },
     {
-        "id": "32086d42.08bf12",
+        "id": "ae4f2855.b375a8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2356.857208251953,
-        "y": 1430.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2340.857208251953,
+        "y": 1431.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "8dd8a7af.a18a58"
+                "ab51cd7c.871d7"
             ]
         ]
     },
     {
-        "id": "8dd8a7af.a18a58",
+        "id": "ab51cd7c.871d7",
         "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": 2553.357208251953,
-        "y": 1431.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2537.357208251953,
+        "y": 1432.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "7ce3d216.f2e854",
+        "id": "280801a6.6b958e",
         "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": 1712.8572082519531,
-        "y": 1115.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1696.8572082519531,
+        "y": 1116.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "174f706f.eb1c4",
+        "id": "c1028f45.2b40b",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1705.8572082519531,
-        "y": 1211.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1689.8572082519531,
+        "y": 1212.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "f5ff6d86.dbc2a8"
+                "601689b5.f1fb7"
             ]
         ]
     },
     {
-        "id": "9f1d9384.e4cf38",
+        "id": "c8739969.39695",
         "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": 2247.857208251953,
-        "y": 1212.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2231.857208251953,
+        "y": 1213.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ce97b583.de0eb"
+                "e6bfc4cb.d914d"
             ]
         ]
     },
     {
-        "id": "ce97b583.de0eb",
+        "id": "e6bfc4cb.d914d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2487.857208251953,
-        "y": 1211.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2471.857208251953,
+        "y": 1212.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "2768322c.982d36"
+                "e4b648de.412ed"
             ]
         ]
     },
     {
-        "id": "edf18693.d94aa8",
+        "id": "bc098bd6.7e5e48",
         "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": 2154.857208251953,
-        "y": 1282.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2138.857208251953,
+        "y": 1283.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddf9d245.932de",
+        "id": "7a600bc6.51d61c",
         "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": 2169.857208251953,
-        "y": 1365.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2153.857208251953,
+        "y": 1366.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2768322c.982d36",
+        "id": "e4b648de.412ed",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1938.8572082519531,
-        "y": 1282.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1922.8572082519531,
+        "y": 1283.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "edf18693.d94aa8",
-                "ddf9d245.932de",
-                "e8412a7e.3847d8"
+                "bc098bd6.7e5e48",
+                "7a600bc6.51d61c",
+                "a8ca1153.971238"
             ]
         ]
     },
     {
-        "id": "a7c641d6.1516b",
+        "id": "4c47b1b9.3083",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1488.8572082519531,
-        "y": 583.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1472.8572082519531,
+        "y": 584.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "bc87beaf.bad8a",
-                "9750b026.40e79",
-                "3b24af37.62d288",
-                "a94779d8.6d99c",
-                "bc633e83.bdfe98",
-                "7ce3d216.f2e854",
-                "dcc81210.7b3bb",
-                "174f706f.eb1c4",
-                "349803e.db927fc",
-                "f9afd12e.2d3128"
+                "26b1ee2d.08273a",
+                "83de20b7.804778",
+                "626a201b.d55578",
+                "749d681a.41547",
+                "3a4d4bdb.4c43d4",
+                "280801a6.6b958e",
+                "d2661b85.b495e",
+                "c1028f45.2b40b",
+                "212189e2.756db6",
+                "cc68ecc2.dbb0c8"
             ]
         ]
     },
     {
-        "id": "dcc81210.7b3bb",
+        "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": 1710.8572082519531,
-        "y": 1165.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1694.8572082519531,
+        "y": 1166.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "fff738e5.4d0ce",
+        "id": "e19d4005.611528",
         "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": 1627.5236206054688,
-        "y": 2099.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1611.5236206054688,
+        "y": 2100.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "16446b33.aaf505",
+        "id": "52baa22c.b272b4",
         "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": 1735.0236206054688,
-        "y": 1915.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1719.0236206054688,
+        "y": 1916.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "95c09049.cf0398"
+                "53c27f81.6966a"
             ]
         ]
     },
     {
-        "id": "95c09049.cf0398",
+        "id": "53c27f81.6966a",
         "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": 1987.5236206054688,
-        "y": 1915.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1971.5236206054688,
+        "y": 1916.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "278f5611.2443c2",
+        "id": "168eba65.ac0bfe",
         "type": "set",
         "name": "set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n",
         "comments": "",
-        "x": 1715.9520874023438,
-        "y": 1854.3808135986328,
-        "z": "b88526e.24a7ad8",
+        "x": 1699.9520874023438,
+        "y": 1855.3808135986328,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "b557bbbd.9b02a",
+        "id": "3248b7d.b604248",
         "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": 1717.5236206054688,
-        "y": 1971.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1701.5236206054688,
+        "y": 1972.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "88f11c7a.f31688",
+        "id": "bb4a1d93.3a86c",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1602.5236206054688,
-        "y": 2056.6663360595703,
-        "z": "b88526e.24a7ad8",
+        "x": 1586.5236206054688,
+        "y": 2057.6663360595703,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "f398ae72.bb9338",
+        "id": "71c717dc.1a41b",
         "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": 1628.5236206054688,
-        "y": 2150.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1612.5236206054688,
+        "y": 2151.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7136f5d4.61b024",
+        "id": "cfb313ac.f6ff68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1969.523681640625,
-        "y": 2184.66650390625,
-        "z": "b88526e.24a7ad8",
+        "x": 1953.523681640625,
+        "y": 2185.66650390625,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "cce60393.cfd56"
+                "99ddd056.c45ef8"
             ]
         ]
     },
     {
-        "id": "37abde73.8b06c2",
+        "id": "4ea93843.2ee25",
         "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": 2334.523681640625,
-        "y": 2284.66650390625,
-        "z": "b88526e.24a7ad8",
+        "x": 2318.523681640625,
+        "y": 2285.66650390625,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "ef775b29.4a7b",
+        "id": "48fa407a.74cf2",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1974.523681640625,
-        "y": 2283.66650390625,
-        "z": "b88526e.24a7ad8",
+        "x": 1958.523681640625,
+        "y": 2284.66650390625,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "cce60393.cfd56"
+                "99ddd056.c45ef8"
             ]
         ]
     },
     {
-        "id": "cce60393.cfd56",
+        "id": "99ddd056.c45ef8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2132.523681640625,
-        "y": 2228.66650390625,
-        "z": "b88526e.24a7ad8",
+        "x": 2116.523681640625,
+        "y": 2229.66650390625,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "546fd473.2cd5dc",
-                "37abde73.8b06c2"
+                "8d122dd3.f5458",
+                "4ea93843.2ee25"
             ]
         ]
     },
     {
-        "id": "546fd473.2cd5dc",
+        "id": "8d122dd3.f5458",
         "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": 2348.523681640625,
-        "y": 2175.66650390625,
-        "z": "b88526e.24a7ad8",
+        "x": 2332.523681640625,
+        "y": 2176.66650390625,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "e2624cc8.4eb57",
+        "id": "9f0b4035.10244",
         "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": 1848.5236206054688,
-        "y": 2407.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1832.5236206054688,
+        "y": 2408.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "be8a0258.a3d64"
+                "ee35f915.82d68"
             ]
         ]
     },
     {
-        "id": "5380bfed.f4864",
+        "id": "1e6b1940.cc1657",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2051.5236206054688,
-        "y": 2625.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2035.5236206054688,
+        "y": 2626.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "94a6c10b.d1c6a"
+                "9d62a2e2.3a7988"
             ]
         ]
     },
     {
-        "id": "94a6c10b.d1c6a",
+        "id": "9d62a2e2.3a7988",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2261.5236206054688,
-        "y": 2625.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2245.5236206054688,
+        "y": 2626.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7afdb21d.b59cb4"
+                "20d781c2.39d966"
             ]
         ]
     },
     {
-        "id": "7afdb21d.b59cb4",
+        "id": "20d781c2.39d966",
         "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": 2458.0236206054688,
-        "y": 2626.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2442.0236206054688,
+        "y": 2627.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "6d5e56ed.17d75",
+        "id": "14a8a060.42cee8",
         "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": 1609.5236206054688,
-        "y": 2309.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1593.5236206054688,
+        "y": 2310.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a133146c.f8d1c",
+        "id": "1441b20e.14024e",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1601.5236206054688,
-        "y": 2406.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1585.5236206054688,
+        "y": 2407.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "e2624cc8.4eb57"
+                "9f0b4035.10244"
             ]
         ]
     },
     {
-        "id": "be8a0258.a3d64",
+        "id": "ee35f915.82d68",
         "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": 2152.5236206054688,
-        "y": 2407.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2136.5236206054688,
+        "y": 2408.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "663752cc.bb14ac"
+                "f03c4ce3.3f12"
             ]
         ]
     },
     {
-        "id": "663752cc.bb14ac",
+        "id": "f03c4ce3.3f12",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2392.5236206054688,
-        "y": 2406.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2376.5236206054688,
+        "y": 2407.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "5dfb8377.41af4c"
+                "6b8f6d22.f5c394"
             ]
         ]
     },
     {
-        "id": "f365dac0.f6fd5",
+        "id": "8e5f54d5.686b8",
         "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": 2059.5236206054688,
-        "y": 2477.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2043.5236206054688,
+        "y": 2478.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f61ff7c0.095698",
+        "id": "46e9ff0c.f30858",
         "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": 2074.5236206054688,
-        "y": 2560.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2058.5236206054688,
+        "y": 2561.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5dfb8377.41af4c",
+        "id": "6b8f6d22.f5c394",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1843.5236206054688,
-        "y": 2477.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1827.5236206054688,
+        "y": 2478.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "f365dac0.f6fd5",
-                "f61ff7c0.095698",
-                "5380bfed.f4864"
+                "8e5f54d5.686b8",
+                "46e9ff0c.f30858",
+                "1e6b1940.cc1657"
             ]
         ]
     },
     {
-        "id": "4849f457.b71524",
+        "id": "a809b004.822848",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1512.6666870117188,
-        "y": 1833.9520416259766,
-        "z": "b88526e.24a7ad8",
+        "x": 1496.6666870117188,
+        "y": 1834.9520416259766,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "278f5611.2443c2",
-                "16446b33.aaf505",
-                "b557bbbd.9b02a"
+                "168eba65.ac0bfe",
+                "52baa22c.b272b4",
+                "3248b7d.b604248"
             ]
         ]
     },
     {
-        "id": "a0bc5db0.876ac8",
+        "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": 1608.5236206054688,
-        "y": 2360.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1592.5236206054688,
+        "y": 2361.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "6e26ff1a.e07b88",
+        "id": "2a82f8ce.16638",
         "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": 1936.8572082519531,
-        "y": 656.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 1920.8572082519531,
+        "y": 657.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "983c7546.c67c28"
+                "703d680a.0882b8"
             ]
         ]
     },
     {
-        "id": "983c7546.c67c28",
+        "id": "703d680a.0882b8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2120.857208251953,
-        "y": 656.1427688598633,
-        "z": "b88526e.24a7ad8",
+        "x": 2104.857208251953,
+        "y": 657.1427688598633,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "11ec24e5.5f86b3"
+                "9332f863.29e018"
             ]
         ]
     },
     {
-        "id": "d8da45ad.01a8a",
+        "id": "e30790a5.8eada8",
         "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": 1848.4762573242188,
-        "y": 4070.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 1832.4762573242188,
+        "y": 4071.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a3bde9b.3b85798",
+        "id": "764d2bf0.389154",
         "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": 1136.9761352539062,
-        "y": 3682.3333892822266,
-        "z": "b88526e.24a7ad8",
+        "x": 1120.9761352539062,
+        "y": 3683.3333892822266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "4c84b197.b55718"
+                "3e3dd5d0.a91612"
             ]
         ]
     },
     {
-        "id": "4c84b197.b55718",
+        "id": "3e3dd5d0.a91612",
         "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": 1416.9761352539062,
-        "y": 3682.3333892822266,
-        "z": "b88526e.24a7ad8",
+        "x": 1400.9761352539062,
+        "y": 3683.3333892822266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "8fbf4fc0.ccf628"
+                "50f0868b.978048"
             ]
         ]
     },
     {
-        "id": "8fbf4fc0.ccf628",
+        "id": "50f0868b.978048",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1625.9762573242188,
-        "y": 3682.3333892822266,
-        "z": "b88526e.24a7ad8",
+        "x": 1609.9762573242188,
+        "y": 3683.3333892822266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "37468c59.dd2414"
+                "f9767b66.ef7fc8"
             ]
         ]
     },
     {
-        "id": "97197bdb.a2cad8",
+        "id": "69d0476a.820ed8",
         "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": 1817.9762573242188,
-        "y": 3871.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 1801.9762573242188,
+        "y": 3872.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "3908bfeb.e84f"
+                "a1e78eab.0fa1e8"
             ]
         ]
     },
     {
-        "id": "28d4f278.d4fa26",
+        "id": "d2c35b36.dd9ed8",
         "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": 2420.4762573242188,
-        "y": 3869.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 2404.4762573242188,
+        "y": 3870.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "73a75422.d8850c",
+        "id": "50c2e9.703e9d18",
         "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": 1815.4762573242188,
-        "y": 3794.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 1799.4762573242188,
+        "y": 3795.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "46fb189c.966838",
+        "id": "90bc6a2d.4662e8",
         "type": "set",
         "name": "set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
         "comments": "",
-        "x": 1815.4762573242188,
-        "y": 3933.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 1799.4762573242188,
+        "y": 3934.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "be439e05.fe7ff8",
+        "id": "fc28ae3b.ec6fc8",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1821.4762573242188,
-        "y": 3998.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 1805.4762573242188,
+        "y": 3999.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "a84918b5.b82848",
+        "id": "5413abd2.a41a7c",
         "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": 1851.4762573242188,
-        "y": 4124.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 1835.4762573242188,
+        "y": 4125.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6db3fc2.418c7",
+        "id": "3783fc44.dd5b6c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2181.476318359375,
-        "y": 4146.3330078125,
-        "z": "b88526e.24a7ad8",
+        "x": 2165.476318359375,
+        "y": 4147.3330078125,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c89f9697.3bcd9"
+                "1c744a01.9209ae"
             ]
         ]
     },
     {
-        "id": "54902e1f.a23738",
+        "id": "cd050f66.de8e9",
         "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": 2546.476318359375,
-        "y": 4246.3330078125,
-        "z": "b88526e.24a7ad8",
+        "x": 2530.476318359375,
+        "y": 4247.3330078125,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "add1de2.24bbda",
+        "id": "73945c44.2de044",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2186.476318359375,
-        "y": 4245.3330078125,
-        "z": "b88526e.24a7ad8",
+        "x": 2170.476318359375,
+        "y": 4246.3330078125,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c89f9697.3bcd9"
+                "1c744a01.9209ae"
             ]
         ]
     },
     {
-        "id": "c89f9697.3bcd9",
+        "id": "1c744a01.9209ae",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2344.476318359375,
-        "y": 4190.3330078125,
-        "z": "b88526e.24a7ad8",
+        "x": 2328.476318359375,
+        "y": 4191.3330078125,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ed1d207b.66697",
-                "54902e1f.a23738"
+                "cb9caa42.183ed",
+                "cd050f66.de8e9"
             ]
         ]
     },
     {
-        "id": "ed1d207b.66697",
+        "id": "cb9caa42.183ed",
         "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": 2560.476318359375,
-        "y": 4137.3330078125,
-        "z": "b88526e.24a7ad8",
+        "x": 2544.476318359375,
+        "y": 4138.3330078125,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "712165ae.c8b134",
+        "id": "afd0ba60.e2d9f",
         "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": 2063.4762573242188,
-        "y": 4426.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2047.4762573242188,
+        "y": 4427.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "a8831bf.0add2e8"
+                "6c40ec43.6ec0dc"
             ]
         ]
     },
     {
-        "id": "c4d874bf.c84648",
+        "id": "83c9c6e9.87388",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2266.4762573242188,
-        "y": 4644.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2250.4762573242188,
+        "y": 4645.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "6c8538a0.f116f8"
+                "a3d90c5b.ef51f"
             ]
         ]
     },
     {
-        "id": "6c8538a0.f116f8",
+        "id": "a3d90c5b.ef51f",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2476.4762573242188,
-        "y": 4644.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2460.4762573242188,
+        "y": 4645.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "4ab33b35.a84a54"
+                "b737d55d.af5d1"
             ]
         ]
     },
     {
-        "id": "4ab33b35.a84a54",
+        "id": "b737d55d.af5d1",
         "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": 2672.9762573242188,
-        "y": 4645.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2656.9762573242188,
+        "y": 4646.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "2bae3b0b.919654",
+        "id": "3d2cb067.b7ddf8",
         "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": 1832.4762573242188,
-        "y": 4329.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 1816.4762573242188,
+        "y": 4330.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "bd0c0aec.c12ba",
+        "id": "5411dd84.42d2fc",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1825.4762573242188,
-        "y": 4425.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 1809.4762573242188,
+        "y": 4426.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "712165ae.c8b134"
+                "afd0ba60.e2d9f"
             ]
         ]
     },
     {
-        "id": "a8831bf.0add2e8",
+        "id": "6c40ec43.6ec0dc",
         "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": 2367.4762573242188,
-        "y": 4426.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2351.4762573242188,
+        "y": 4427.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "b4bafecc.dbd1d8"
+                "cae9e560.df808"
             ]
         ]
     },
     {
-        "id": "b4bafecc.dbd1d8",
+        "id": "cae9e560.df808",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2607.4762573242188,
-        "y": 4425.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2591.4762573242188,
+        "y": 4426.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "37f99340.6371ac"
+                "a89ce0fc.1e145"
             ]
         ]
     },
     {
-        "id": "c6f61ac6.058e2",
+        "id": "b3a6efba.ab4d7",
         "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": 2274.4762573242188,
-        "y": 4496.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2258.4762573242188,
+        "y": 4497.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7b6510ed.263a5",
+        "id": "be3eae60.aeb878",
         "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": 2289.4762573242188,
-        "y": 4579.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2273.4762573242188,
+        "y": 4580.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "37f99340.6371ac",
+        "id": "a89ce0fc.1e145",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2058.4762573242188,
-        "y": 4496.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 2042.4762573242188,
+        "y": 4497.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c6f61ac6.058e2",
-                "7b6510ed.263a5",
-                "c4d874bf.c84648"
+                "b3a6efba.ab4d7",
+                "be3eae60.aeb878",
+                "83c9c6e9.87388"
             ]
         ]
     },
     {
-        "id": "37468c59.dd2414",
+        "id": "f9767b66.ef7fc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1608.4762573242188,
-        "y": 3797.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 1592.4762573242188,
+        "y": 3798.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "73a75422.d8850c",
-                "97197bdb.a2cad8",
-                "46fb189c.966838",
-                "be439e05.fe7ff8",
-                "d8da45ad.01a8a",
-                "2bae3b0b.919654",
-                "6650d50f.f2a194",
-                "bd0c0aec.c12ba",
-                "a84918b5.b82848",
-                "99585b38.25a06"
+                "50c2e9.703e9d18",
+                "69d0476a.820ed8",
+                "90bc6a2d.4662e8",
+                "fc28ae3b.ec6fc8",
+                "e30790a5.8eada8",
+                "3d2cb067.b7ddf8",
+                "cf08ea1b.928b78",
+                "5411dd84.42d2fc",
+                "5413abd2.a41a7c",
+                "b562a092.868848"
             ]
         ]
     },
     {
-        "id": "6650d50f.f2a194",
+        "id": "cf08ea1b.928b78",
         "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": 1830.4762573242188,
-        "y": 4379.332901000977,
-        "z": "b88526e.24a7ad8",
+        "x": 1814.4762573242188,
+        "y": 4380.332901000977,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "3908bfeb.e84f",
+        "id": "a1e78eab.0fa1e8",
         "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": 2056.4762573242188,
-        "y": 3870.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 2040.4762573242188,
+        "y": 3871.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "5a34ee8b.f9c61"
+                "c351bced.05391"
             ]
         ]
     },
     {
-        "id": "5a34ee8b.f9c61",
+        "id": "c351bced.05391",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2240.4762573242188,
-        "y": 3870.3329010009766,
-        "z": "b88526e.24a7ad8",
+        "x": 2224.4762573242188,
+        "y": 3871.3329010009766,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "28d4f278.d4fa26"
+                "d2c35b36.dd9ed8"
             ]
         ]
     },
     {
-        "id": "f841aff3.13a07",
+        "id": "4b1c4a05.4570ec",
         "type": "switchNode",
         "name": "switch capability-type. vnf",
         "xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 372.1428527832031,
-        "y": 300.99999237060547,
-        "z": "b88526e.24a7ad8",
+        "x": 356.1428527832031,
+        "y": 301.99999237060547,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "58dd98ce.eb99f"
+                "812c03eb.24e6a8"
             ]
         ]
     },
     {
-        "id": "58dd98ce.eb99f",
+        "id": "812c03eb.24e6a8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 575.5714111328125,
-        "y": 300.2857208251953,
-        "z": "b88526e.24a7ad8",
+        "x": 559.5714111328125,
+        "y": 301.2857208251953,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7b0e8ad8.f3802c"
+                "32866df4.63e6ea"
             ]
         ]
     },
     {
-        "id": "571f0673.b8518",
+        "id": "324d6ccc.ba650c",
         "type": "switchNode",
         "name": "switch capability-type vf-module",
         "xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 501.4761962890625,
-        "y": 3464.3333282470703,
-        "z": "b88526e.24a7ad8",
+        "x": 485.4761962890625,
+        "y": 3465.3333282470703,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "48a38bbd.e8a77c"
+                "ac3b4f92.a95c5"
             ]
         ]
     },
     {
-        "id": "48a38bbd.e8a77c",
+        "id": "ac3b4f92.a95c5",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 720.4761962890625,
-        "y": 3465.3333892822266,
-        "z": "b88526e.24a7ad8",
+        "x": 704.4761962890625,
+        "y": 3466.3333892822266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "750bfd10.899924"
+                "e2804051.7cbab"
             ]
         ]
     },
     {
-        "id": "a6e4bc7d.20b678",
+        "id": "70bd05a3.857634",
         "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": 1613.5236206054688,
-        "y": 2586.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1597.5236206054688,
+        "y": 2587.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ffc03440.e917d"
+                "962e71b2.6cdc38"
             ]
         ]
     },
     {
-        "id": "ffc03440.e917d",
+        "id": "962e71b2.6cdc38",
         "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": 1739.1902465820312,
-        "y": 2717.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1723.1902465820312,
+        "y": 2718.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "1af41882.7a6b4f"
+                "7337023b.2c5cac"
             ]
         ]
     },
     {
-        "id": "1af41882.7a6b4f",
+        "id": "7337023b.2c5cac",
         "type": "failure",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2001.1902465820312,
-        "y": 2773.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 1985.1902465820312,
+        "y": 2774.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "fcd660c4.530c58"
+                "351fff6a.5eb578"
             ]
         ]
     },
     {
-        "id": "fcd660c4.530c58",
+        "id": "351fff6a.5eb578",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2217.1902465820312,
-        "y": 2773.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2201.1902465820312,
+        "y": 2774.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "236c01c7.bf3206",
-                "bd4596a.19984e8"
+                "db60e930.c4136",
+                "e87c4b29.75482"
             ]
         ]
     },
     {
-        "id": "236c01c7.bf3206",
+        "id": "db60e930.c4136",
         "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": 2437.1902465820312,
-        "y": 2711.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2421.1902465820312,
+        "y": 2712.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "bd4596a.19984e8",
+        "id": "e87c4b29.75482",
         "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": 2447.1902465820312,
-        "y": 2819.6663970947266,
-        "z": "b88526e.24a7ad8",
+        "x": 2431.1902465820312,
+        "y": 2820.6663970947266,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "4bd2a625.600b48",
+        "id": "767ed8a1.4a0fd",
         "type": "switchNode",
         "name": "switch capability action unassign",
         "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 829.7142333984375,
-        "y": 391.1428680419922,
-        "z": "b88526e.24a7ad8",
+        "x": 813.7142333984375,
+        "y": 392.1428680419922,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "f5867b52.e6b6c"
+                "d918681a.83f4a"
             ]
         ]
     },
     {
-        "id": "f5867b52.e6b6c",
+        "id": "d918681a.83f4a",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1115.4285278320312,
-        "y": 389.7142791748047,
-        "z": "b88526e.24a7ad8",
+        "x": 1099.4285278320312,
+        "y": 390.7142791748047,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "f5e94169.5fc978"
+                "44cc33ed.fb39e4"
             ]
         ]
     },
     {
-        "id": "7b0e8ad8.f3802c",
+        "id": "32866df4.63e6ea",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 579.7142944335938,
-        "y": 365.42860412597656,
-        "z": "b88526e.24a7ad8",
+        "x": 563.7142944335938,
+        "y": 366.42860412597656,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "4bd2a625.600b48",
-                "4312cb34.d1fec4"
+                "767ed8a1.4a0fd",
+                "2c3347a4.1d0d28"
             ]
         ]
     },
     {
-        "id": "acaab3ca.702c88",
+        "id": "28134cd4.8102bc",
         "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": 1054.0715942382812,
-        "y": 1777.166763305664,
-        "z": "b88526e.24a7ad8",
+        "x": 1038.0715942382812,
+        "y": 1778.166763305664,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ae04112f.bd2d08"
+                "ea821c0d.f138f"
             ]
         ]
     },
     {
-        "id": "ae04112f.bd2d08",
+        "id": "ea821c0d.f138f",
         "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": 1295.6786499023438,
-        "y": 1777.166763305664,
-        "z": "b88526e.24a7ad8",
+        "x": 1279.6786499023438,
+        "y": 1778.166763305664,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "1e81a1ec.bd42f6"
+                "5fdd4f70.822d6"
             ]
         ]
     },
     {
-        "id": "1e81a1ec.bd42f6",
+        "id": "5fdd4f70.822d6",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1476.3930053710938,
-        "y": 1777.166763305664,
-        "z": "b88526e.24a7ad8",
+        "x": 1460.3930053710938,
+        "y": 1778.166763305664,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "4849f457.b71524"
+                "a809b004.822848"
             ]
         ]
     },
     {
-        "id": "d951a688.ea8908",
+        "id": "6a2168f8.52087",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8572387695312,
-        "y": 3593.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 1192.8572387695312,
+        "y": 3594.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "a3bde9b.3b85798"
+                "764d2bf0.389154"
             ]
         ]
     },
     {
-        "id": "90ab2ac1.82262",
+        "id": "c27c9e8f.dedd2",
         "type": "switchNode",
         "name": "switch capability action unassign",
         "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 967.8569946289062,
-        "y": 3593.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 951.8569946289062,
+        "y": 3594.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "d951a688.ea8908"
+                "6a2168f8.52087"
             ]
         ]
     },
     {
-        "id": "750bfd10.899924",
+        "id": "e2804051.7cbab",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 724.8571166992188,
-        "y": 3530.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 708.8571166992188,
+        "y": 3531.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "90ab2ac1.82262",
-                "876d4c7d.f86a88"
+                "c27c9e8f.dedd2",
+                "d8487376.9bcfd"
             ]
         ]
     },
     {
-        "id": "876d4c7d.f86a88",
+        "id": "d8487376.9bcfd",
         "type": "switchNode",
         "name": "switch capability action assign",
         "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 944.8096313476562,
-        "y": 5201.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 928.8096313476562,
+        "y": 5202.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "97b1b31a.f402b"
+                "9fcd1d47.5645c8"
             ]
         ]
     },
     {
-        "id": "97b1b31a.f402b",
+        "id": "9fcd1d47.5645c8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1173.8096313476562,
-        "y": 5201.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 1157.8096313476562,
+        "y": 5202.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "bf89c636.30aac8"
+                "9cfc91ea.726d38"
             ]
         ]
     },
     {
-        "id": "c54c6f8e.b8ff58",
+        "id": "920d5892.fd6d68",
         "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": 1722.3095092773438,
-        "y": 5671.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1706.3095092773438,
+        "y": 5672.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b361600c.eb049",
+        "id": "4f85a78f.b9dd4",
         "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": 2040.5595092773438,
-        "y": 5479.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 2024.5595092773438,
+        "y": 5480.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "b5cdeaa7.6f11d"
+                "172c4c1f.fc374c"
             ]
         ]
     },
     {
-        "id": "b5cdeaa7.6f11d",
+        "id": "172c4c1f.fc374c",
         "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": 2297.0595092773438,
-        "y": 5479.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 2281.0595092773438,
+        "y": 5480.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "8bb2899.7eabb78",
+        "id": "f9d872c.140039",
         "type": "set",
         "name": "set set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
         "comments": "",
-        "x": 2023.0595092773438,
-        "y": 5425.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 2007.0595092773438,
+        "y": 5426.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "feb610d7.764ab",
+        "id": "63be973.1d659e8",
         "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": 2029.0595092773438,
-        "y": 5541.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 2013.0595092773438,
+        "y": 5542.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "aba737c8.b673a",
+        "id": "9191c58b.b355c8",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1692.3095092773438,
-        "y": 5620.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1676.3095092773438,
+        "y": 5621.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "e94ef6dd.a37908",
+        "id": "f18ac492.ee4eb",
         "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": 1725.3095092773438,
-        "y": 5725.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1709.3095092773438,
+        "y": 5726.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ec3d3c3.85586c",
+        "id": "965c8b30.02d398",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2028.3095703125,
-        "y": 5739.58447265625,
-        "z": "b88526e.24a7ad8",
+        "x": 2012.3095703125,
+        "y": 5740.58447265625,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "21b0f329.fc401c"
+                "f4e23bde.24eef"
             ]
         ]
     },
     {
-        "id": "7a611dc7.f16d14",
+        "id": "180b7df9.28995a",
         "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": 2393.3095703125,
-        "y": 5839.58447265625,
-        "z": "b88526e.24a7ad8",
+        "x": 2377.3095703125,
+        "y": 5840.58447265625,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "80386656.f0d7d",
+        "id": "1877c29b.11c2e5",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2033.3095703125,
-        "y": 5838.58447265625,
-        "z": "b88526e.24a7ad8",
+        "x": 2017.3095703125,
+        "y": 5839.58447265625,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "21b0f329.fc401c"
+                "f4e23bde.24eef"
             ]
         ]
     },
     {
-        "id": "21b0f329.fc401c",
+        "id": "f4e23bde.24eef",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2191.3095703125,
-        "y": 5783.58447265625,
-        "z": "b88526e.24a7ad8",
+        "x": 2175.3095703125,
+        "y": 5784.58447265625,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7a611dc7.f16d14",
-                "399dfaf7.a00f2e"
+                "180b7df9.28995a",
+                "88545db3.91b2f8"
             ]
         ]
     },
     {
-        "id": "399dfaf7.a00f2e",
+        "id": "88545db3.91b2f8",
         "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": 2407.3095703125,
-        "y": 5730.58447265625,
-        "z": "b88526e.24a7ad8",
+        "x": 2391.3095703125,
+        "y": 5731.58447265625,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "8744b72d.e0422",
+        "id": "787fb15a.391898",
         "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": 2003.3095092773438,
-        "y": 6315.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1987.3095092773438,
+        "y": 6316.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "26376a44.3bf3e6"
+                "5f3830ae.3b7538"
             ]
         ]
     },
     {
-        "id": "c8297614.5665c8",
+        "id": "854fee6.3fdc71",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2174.3095092773438,
-        "y": 6473.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2158.3095092773438,
+        "y": 6474.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "5c1866b1.7ab59"
+                "c27fc49d.c8374"
             ]
         ]
     },
     {
-        "id": "5c1866b1.7ab59",
+        "id": "c27fc49d.c8374",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2378.3095092773438,
-        "y": 6471.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2362.3095092773438,
+        "y": 6472.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "8068dba1.b90f38"
+                "49f045b5.0d39c4"
             ]
         ]
     },
     {
-        "id": "8068dba1.b90f38",
+        "id": "49f045b5.0d39c4",
         "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": 2572.8095092773438,
-        "y": 6404.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2556.8095092773438,
+        "y": 6405.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "cbc78ec6.7ff248",
+        "id": "b37ecff9.03eaa8",
         "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": 1706.3095092773438,
-        "y": 5838.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1690.3095092773438,
+        "y": 5839.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e5d91b7.f1cac6",
+        "id": "f5c7340.140185",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1735.3095092773438,
-        "y": 6316.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1719.3095092773438,
+        "y": 6317.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "8744b72d.e0422"
+                "787fb15a.391898"
             ]
         ]
     },
     {
-        "id": "26376a44.3bf3e6",
+        "id": "5f3830ae.3b7538",
         "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": 2287.3095092773438,
-        "y": 6319.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2271.3095092773438,
+        "y": 6320.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "6638dc1c.c0f774"
+                "6e6d2e55.ed356"
             ]
         ]
     },
     {
-        "id": "6638dc1c.c0f774",
+        "id": "6e6d2e55.ed356",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2515.3095092773438,
-        "y": 6316.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2499.3095092773438,
+        "y": 6317.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "49c6c4cb.ae35f4"
+                "177cba1.8a3a046"
             ]
         ]
     },
     {
-        "id": "614640d1.2410b",
+        "id": "76939575.7aa904",
         "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": 2182.3095092773438,
-        "y": 6369.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2166.3095092773438,
+        "y": 6370.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f159cc8b.de17d",
+        "id": "bd832c6d.e0325",
         "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": 2195.3095092773438,
-        "y": 6428.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2179.3095092773438,
+        "y": 6429.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "49c6c4cb.ae35f4",
+        "id": "177cba1.8a3a046",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1942.3095092773438,
-        "y": 6395.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1926.3095092773438,
+        "y": 6396.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "c8297614.5665c8",
-                "614640d1.2410b",
-                "f159cc8b.de17d"
+                "854fee6.3fdc71",
+                "76939575.7aa904",
+                "bd832c6d.e0325"
             ]
         ]
     },
     {
-        "id": "80097c84.1bbc38",
+        "id": "e20ed5c.32f5da8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1816.0595092773438,
-        "y": 5428.334121704102,
-        "z": "b88526e.24a7ad8",
+        "x": 1800.0595092773438,
+        "y": 5429.334121704102,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "b361600c.eb049",
-                "8bb2899.7eabb78",
-                "feb610d7.764ab"
+                "4f85a78f.b9dd4",
+                "f9d872c.140039",
+                "63be973.1d659e8"
             ]
         ]
     },
     {
-        "id": "d085846f.259da",
+        "id": "5e93d51f.0cdb84",
         "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": 1708.3095092773438,
-        "y": 5890.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1692.3095092773438,
+        "y": 5891.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "2d4ee971.9f5306",
+        "id": "dfa3d386.e26368",
         "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": 1730.3095092773438,
-        "y": 6538.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1714.3095092773438,
+        "y": 6539.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "968d7f58.752fa8"
+                "f3d23ebf.0d11b"
             ]
         ]
     },
     {
-        "id": "968d7f58.752fa8",
+        "id": "f3d23ebf.0d11b",
         "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": 2036.3095092773438,
-        "y": 6536.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2020.3095092773438,
+        "y": 6537.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "b316390f.c223e"
+                "4788805e.3ba1d8"
             ]
         ]
     },
     {
-        "id": "b316390f.c223e",
+        "id": "4788805e.3ba1d8",
         "type": "failure",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2274.3095092773438,
-        "y": 6536.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2258.3095092773438,
+        "y": 6537.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "523d1dc3.a4cfdc"
+                "33994871.8869b8"
             ]
         ]
     },
     {
-        "id": "523d1dc3.a4cfdc",
+        "id": "33994871.8869b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2436.3095092773438,
-        "y": 6530.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2420.3095092773438,
+        "y": 6531.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "196036c5.88ba19",
-                "a33c55dc.d6268"
+                "b85bda2d.9d095",
+                "bd0032a6.185cd8"
             ]
         ]
     },
     {
-        "id": "196036c5.88ba19",
+        "id": "b85bda2d.9d095",
         "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": 2660.3095092773438,
-        "y": 6496.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2644.3095092773438,
+        "y": 6497.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "a33c55dc.d6268",
+        "id": "bd0032a6.185cd8",
         "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": 2648.3095092773438,
-        "y": 6596.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2632.3095092773438,
+        "y": 6597.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "af0954c0.0ed2a8",
+        "id": "5d27e69c.99355",
         "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": 1718.3095092773438,
-        "y": 5996.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1702.3095092773438,
+        "y": 5997.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "fcdfe07c.36982"
+                "d4c9fe83.84aac8"
             ]
         ]
     },
     {
-        "id": "fcdfe07c.36982",
+        "id": "d4c9fe83.84aac8",
         "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": 1971.8095092773438,
-        "y": 5997.584854125977,
-        "z": "b88526e.24a7ad8",
+        "x": 1955.8095092773438,
+        "y": 5998.584854125977,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ecb5c713.928a5"
+                "c85b8b2c.2fc05"
             ]
         ]
     },
     {
-        "id": "ecb5c713.928a5",
+        "id": "c85b8b2c.2fc05",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2164.8095092773438,
-        "y": 5998.084732055664,
-        "z": "b88526e.24a7ad8",
+        "x": 2148.8095092773438,
+        "y": 5999.084732055664,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "a271047.93a13f8"
+                "1dc11508.39f67b"
             ]
         ]
     },
     {
-        "id": "a271047.93a13f8",
+        "id": "1dc11508.39f67b",
         "type": "for",
         "name": "for j in resource key",
-        "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[$cn].resource-resolution-data.resource-key_length`' >\n",
+        "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": 1806.3095092773438,
-        "y": 6112.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 1796.0238647460938,
+        "y": 6107.870666503906,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "a54bbb54.f3ff88"
+                "fdb568af.3349a8"
             ]
         ]
     },
     {
-        "id": "a54bbb54.f3ff88",
+        "id": "fdb568af.3349a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2078.3095092773438,
-        "y": 6108.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2066.5953369140625,
+        "y": 6109.584655761719,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7a50c097.1fd508",
-                "bae1a795.c95818",
-                "6cb03d6a.b426e4",
-                "fdef5f45.af46b8",
-                "d977a0bb.d25038",
-                "d4543380.8a8648",
-                "80d478e2.ca4f3"
+                "c7c8f5c5.e7ace8",
+                "5b56627b.8b263c",
+                "8553a1d9.e2d5a8",
+                "e7c811b5.eee95",
+                "52a023ea.e09d54",
+                "bf45f76d.ed3c68",
+                "ea657b65.61ab28"
             ]
         ]
     },
     {
-        "id": "bae1a795.c95818",
+        "id": "5b56627b.8b263c",
         "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": 2516.3095092773438,
-        "y": 5984.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2500.3095092773438,
+        "y": 5985.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "e21bbc33.3bd9b8"
+                "a1c68f19.01d038"
             ]
         ]
     },
     {
-        "id": "6cb03d6a.b426e4",
+        "id": "8553a1d9.e2d5a8",
         "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": 2484.3095092773438,
-        "y": 6042.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2468.3095092773438,
+        "y": 6043.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "26752abf.e0f87e"
+                "62bb6ad6.a53de4"
             ]
         ]
     },
     {
-        "id": "fdef5f45.af46b8",
+        "id": "e7c811b5.eee95",
         "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": 2482.3095092773438,
-        "y": 6104.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2466.3095092773438,
+        "y": 6105.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "99545f4f.9552"
+                "3d8cad4d.93e9ea"
             ]
         ]
     },
     {
-        "id": "d977a0bb.d25038",
+        "id": "52a023ea.e09d54",
         "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": 2490.3095092773438,
-        "y": 6166.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2474.3095092773438,
+        "y": 6167.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "d332c105.d01b6"
+                "82c20f3a.6eaf3"
             ]
         ]
     },
     {
-        "id": "7a50c097.1fd508",
+        "id": "c7c8f5c5.e7ace8",
         "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": 2506.3095092773438,
-        "y": 5912.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2490.3095092773438,
+        "y": 5913.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "343730f6.0bde"
+                "6f52d21a.388114"
             ]
         ]
     },
     {
-        "id": "343730f6.0bde",
+        "id": "6f52d21a.388114",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2710.3095092773438,
-        "y": 5908.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2694.3095092773438,
+        "y": 5909.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "10dcd678.f75eb2"
+                "9fa0d09b.7817b"
             ]
         ]
     },
     {
-        "id": "e21bbc33.3bd9b8",
+        "id": "a1c68f19.01d038",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2710.3095092773438,
-        "y": 5982.834487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2694.3095092773438,
+        "y": 5983.834487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ba46d15f.84fe98"
+                "437a342d.168b3c"
             ]
         ]
     },
     {
-        "id": "26752abf.e0f87e",
+        "id": "62bb6ad6.a53de4",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716.3095092773438,
-        "y": 6038.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2700.3095092773438,
+        "y": 6039.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ec7f1ff2.18d6b8"
+                "50785314.d70f24"
             ]
         ]
     },
     {
-        "id": "99545f4f.9552",
+        "id": "3d8cad4d.93e9ea",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2720.3095092773438,
-        "y": 6096.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2704.3095092773438,
+        "y": 6097.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "9cb30ad2.947f6"
+                "5705e23b.a1cf84"
             ]
         ]
     },
     {
-        "id": "d332c105.d01b6",
+        "id": "82c20f3a.6eaf3",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2726.3095092773438,
-        "y": 6162.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2710.3095092773438,
+        "y": 6163.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "78957203.1f8534"
+                "90e5277b.fe7688"
             ]
         ]
     },
     {
-        "id": "10dcd678.f75eb2",
+        "id": "9fa0d09b.7817b",
         "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": 2874.3095092773438,
-        "y": 5910.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2858.3095092773438,
+        "y": 5911.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "ba46d15f.84fe98",
+        "id": "437a342d.168b3c",
         "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": 2920.3095092773438,
-        "y": 5976.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2904.3095092773438,
+        "y": 5977.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "ec7f1ff2.18d6b8",
+        "id": "50785314.d70f24",
         "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": 2964.3095092773438,
-        "y": 6040.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2948.3095092773438,
+        "y": 6041.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "9cb30ad2.947f6",
+        "id": "5705e23b.a1cf84",
         "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": 2940.3095092773438,
-        "y": 6094.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2924.3095092773438,
+        "y": 6095.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "78957203.1f8534",
+        "id": "90e5277b.fe7688",
         "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": 2886.3095092773438,
-        "y": 6160.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2870.3095092773438,
+        "y": 6161.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "72d6e55e.c52994",
+        "id": "3eb0fb20.3c8784",
         "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": 2892.3095092773438,
-        "y": 6216.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2876.3095092773438,
+        "y": 6217.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "f9bda76a.6618c8",
+        "id": "7aa119bc.c8649",
         "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": 2910.3095092773438,
-        "y": 6272.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2894.3095092773438,
+        "y": 6273.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "d4543380.8a8648",
+        "id": "bf45f76d.ed3c68",
         "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": 2490.3095092773438,
-        "y": 6218.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2474.3095092773438,
+        "y": 6219.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "ebf87fd3.da0e28"
+                "543b01b7.f299f8"
             ]
         ]
     },
     {
-        "id": "80d478e2.ca4f3",
+        "id": "ea657b65.61ab28",
         "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": 2488.3095092773438,
-        "y": 6272.584487915039,
-        "z": "b88526e.24a7ad8",
+        "x": 2472.3095092773438,
+        "y": 6273.584487915039,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "e0094cf6.191bc"
+                "bdbf1963.90f8d"
             ]
         ]
     },
     {
-        "id": "ebf87fd3.da0e28",
+        "id": "543b01b7.f299f8",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2724.3095092773438,
-        "y": 6216.584487915038,
-        "z": "b88526e.24a7ad8",
+        "x": 2708.3095092773438,
+        "y": 6217.584487915038,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "72d6e55e.c52994"
+                "3eb0fb20.3c8784"
             ]
         ]
     },
     {
-        "id": "e0094cf6.191bc",
+        "id": "bdbf1963.90f8d",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2718.3095092773438,
-        "y": 6270.584487915038,
-        "z": "b88526e.24a7ad8",
+        "x": 2702.3095092773438,
+        "y": 6271.584487915038,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "f9bda76a.6618c8"
+                "7aa119bc.c8649"
             ]
         ]
     },
     {
-        "id": "c88ce4fa.2e3558",
+        "id": "3c8588b.9d7d378",
         "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": 1258.8571166992188,
-        "y": 5374.571670532227,
-        "z": "b88526e.24a7ad8",
+        "x": 1242.8571166992188,
+        "y": 5375.571670532227,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "5a20be5b.b3a028"
+                "7a0efead.43ce28"
             ]
         ]
     },
     {
-        "id": "5a20be5b.b3a028",
+        "id": "7a0efead.43ce28",
         "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": 1538.8571166992188,
-        "y": 5374.571670532227,
-        "z": "b88526e.24a7ad8",
+        "x": 1522.8571166992188,
+        "y": 5375.571670532227,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "deb0eb20.bf079"
+                "31adf68d.f27ac2"
             ]
         ]
     },
     {
-        "id": "deb0eb20.bf079",
+        "id": "31adf68d.f27ac2",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1747.8572387695312,
-        "y": 5374.571670532227,
-        "z": "b88526e.24a7ad8",
+        "x": 1731.8572387695312,
+        "y": 5375.571670532227,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "80097c84.1bbc38"
+                "e20ed5c.32f5da8"
             ]
         ]
     },
     {
-        "id": "96d8122d.bb415",
+        "id": "1d187540.6f1cc3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 833.1071166992188,
-        "y": 1717.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 817.1071166992188,
+        "y": 1718.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "acaab3ca.702c88",
-                "6764646d.7a6754",
-                "e7afeea8.32592"
+                "28134cd4.8102bc",
+                "b3cbf23b.ff3db8",
+                "39c643cc.a6f784"
             ]
         ]
     },
     {
-        "id": "6764646d.7a6754",
+        "id": "b3cbf23b.ff3db8",
         "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": 1040.8571166992188,
-        "y": 1718.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 1024.8571166992188,
+        "y": 1719.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "e7afeea8.32592",
+        "id": "39c643cc.a6f784",
         "type": "switchNode",
         "name": "switch tmp.naming-data-payload is null",
         "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1088.8571166992188,
-        "y": 1997.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 1072.8571166992188,
+        "y": 1998.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "b86e6a12.7ee33"
+                "6afda891.090ee8"
             ]
         ]
     },
     {
-        "id": "b86e6a12.7ee33",
+        "id": "6afda891.090ee8",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1325.8571166992188,
-        "y": 1998.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 1309.8571166992188,
+        "y": 1999.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "6e3664a9.34079c"
+                "5dc815b0.cc07ec"
             ]
         ]
     },
     {
-        "id": "6e3664a9.34079c",
+        "id": "5dc815b0.cc07ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1363.8571166992188,
-        "y": 2056.5714263916016,
-        "z": "b88526e.24a7ad8",
+        "x": 1347.8571166992188,
+        "y": 2057.5714263916016,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "88f11c7a.f31688",
-                "fff738e5.4d0ce",
-                "f398ae72.bb9338",
-                "6d5e56ed.17d75",
-                "a0bc5db0.876ac8",
-                "a133146c.f8d1c",
-                "a6e4bc7d.20b678",
-                "93dc5615.04a418"
+                "bb4a1d93.3a86c",
+                "e19d4005.611528",
+                "71c717dc.1a41b",
+                "14a8a060.42cee8",
+                "cd259e38.191b18",
+                "1441b20e.14024e",
+                "70bd05a3.857634",
+                "a1fb5091.45b8b8"
             ]
         ]
     },
     {
-        "id": "bf89c636.30aac8",
+        "id": "9cfc91ea.726d38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1009.8571166992188,
-        "y": 5307.571426391602,
-        "z": "b88526e.24a7ad8",
+        "x": 993.8571166992188,
+        "y": 5308.571426391602,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "86e86da4.4fe67",
-                "c88ce4fa.2e3558",
-                "b36f7e94.174be"
+                "19501c77.860e0c",
+                "3c8588b.9d7d378",
+                "77587c38.f5170c"
             ]
         ]
     },
     {
-        "id": "86e86da4.4fe67",
+        "id": "19501c77.860e0c",
         "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": 1246.8571166992188,
-        "y": 5306.571426391602,
-        "z": "b88526e.24a7ad8",
+        "x": 1230.8571166992188,
+        "y": 5307.571426391602,
+        "z": "352ca92a.868d0e",
         "wires": []
     },
     {
-        "id": "b36f7e94.174be",
+        "id": "77587c38.f5170c",
         "type": "switchNode",
         "name": "switch tmp.naming-data-payload is null",
         "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1289.1071472167969,
-        "y": 5497.071548461914,
-        "z": "b88526e.24a7ad8",
+        "x": 1273.1071472167969,
+        "y": 5498.071548461914,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "1f8cfbc.8ebb904"
+                "212b3074.a654f"
             ]
         ]
     },
     {
-        "id": "1f8cfbc.8ebb904",
+        "id": "212b3074.a654f",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522.857177734375,
-        "y": 5496.821304321289,
-        "z": "b88526e.24a7ad8",
+        "x": 1506.857177734375,
+        "y": 5497.821304321289,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "d5e5468.2a80438"
+                "4671f4c1.916ba4"
             ]
         ]
     },
     {
-        "id": "d5e5468.2a80438",
+        "id": "4671f4c1.916ba4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1510.607177734375,
-        "y": 5574.071670532227,
-        "z": "b88526e.24a7ad8",
+        "x": 1494.607177734375,
+        "y": 5575.071670532227,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "aba737c8.b673a",
-                "c54c6f8e.b8ff58",
-                "e94ef6dd.a37908",
-                "cbc78ec6.7ff248",
-                "d085846f.259da",
-                "af0954c0.0ed2a8",
-                "1e5d91b7.f1cac6",
-                "2d4ee971.9f5306",
-                "d6d7c682.438ef8"
+                "9191c58b.b355c8",
+                "920d5892.fd6d68",
+                "f18ac492.ee4eb",
+                "b37ecff9.03eaa8",
+                "5e93d51f.0cdb84",
+                "5d27e69c.99355",
+                "f5c7340.140185",
+                "dfa3d386.e26368",
+                "f6148def.164458"
             ]
         ]
     },
     {
-        "id": "2a352877.19cd9",
+        "id": "5c83d412.2769f4",
         "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": 375,
-        "y": 176,
-        "z": "b88526e.24a7ad8",
+        "x": 359,
+        "y": 177,
+        "z": "352ca92a.868d0e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6d7c682.438ef8",
+        "id": "f6148def.164458",
         "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": 1771,
-        "y": 5787,
-        "z": "b88526e.24a7ad8",
+        "x": 1755,
+        "y": 5788,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "1ec3d3c3.85586c",
-                "80386656.f0d7d"
+                "965c8b30.02d398",
+                "1877c29b.11c2e5"
             ]
         ]
     },
     {
-        "id": "93dc5615.04a418",
+        "id": "a1fb5091.45b8b8",
         "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": 1674,
-        "y": 2229,
-        "z": "b88526e.24a7ad8",
+        "x": 1658,
+        "y": 2230,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "7136f5d4.61b024",
-                "ef775b29.4a7b"
+                "cfb313ac.f6ff68",
+                "48fa407a.74cf2"
             ]
         ]
     },
     {
-        "id": "99585b38.25a06",
+        "id": "b562a092.868848",
         "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": 1891,
-        "y": 4194,
-        "z": "b88526e.24a7ad8",
+        "x": 1875,
+        "y": 4195,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "e6db3fc2.418c7",
-                "add1de2.24bbda"
+                "3783fc44.dd5b6c",
+                "73945c44.2de044"
             ]
         ]
     },
     {
-        "id": "f9afd12e.2d3128",
+        "id": "cc68ecc2.dbb0c8",
         "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": 1784,
-        "y": 979,
-        "z": "b88526e.24a7ad8",
+        "x": 1768,
+        "y": 980,
+        "z": "352ca92a.868d0e",
         "wires": [
             [
-                "8af1d548.36ba08",
-                "6b5d2c36.36d07c"
+                "e1ab56a7.feeeb",
+                "7a8d9826.51e62"
             ]
         ]
     },
     {
-        "id": "63a7432d.46f304",
+        "id": "5e135e40.b1de4",
         "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": 838,
-        "y": 106,
-        "z": "b88526e.24a7ad8",
+        "x": 822,
+        "y": 107,
+        "z": "352ca92a.868d0e",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name.xml
index ba373a26..719d009b 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='${project.version}'>
+    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'>
     <method rpc='self-serve-generate-name' mode='sync'>
         <block atomic="true">
             <set>
@@ -499,7 +499,7 @@
                                                 <for index='cn' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
                                                     <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].name == 'vnfc-name'`">
                                                         <outcome value='true'>
-                                                            <for 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`' >
+                                                            <for silentFailure='true' index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key_length`' >
                                                                 <block>
                                                                     <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cn].resource-resolution-data.resource-key[$j].name == 'vm-type'`">
                                                                         <outcome value='true'>