self-serve-generate-name DG changes

Refactor the naming genereation sub dg for assign and un-assign to trigger the name generation rest API directly

Change-Id: Ie060bed01f6c694f34e2c2518b69873e4728bd71
Issue-ID: CCSDK-482
Signed-off-by: Singh, Ajay (as396y) <as396y@att.com>
Former-commit-id: 582888bc81e55ef4bf11d34c95eb7ac589de51b0

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index b9ca1f6..ef99e9d 100644 (file)
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -10,6 +10,9 @@ restapi.trustStorePassword=adminadmin
 restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12
 restapi.keyStorePassword=adminadmin
 restapi.connection-oof-url=http://oof.api.simpledemo.onap.org:8698/v1/route
+naming.gen-name.url=http://{naming-ms-instance-url}
+naming.gen-name.user={naming-ms-user}
+naming.gen-name.pwd={naming-ms-pwd}
 
 # Templates
 restapi.sz.templatefile=security-zone-allotted-resource.json
@@ -27,6 +30,7 @@ restapi.services.vnf.vfmodule.templatefile=vfmodule-vim-parameters.vgw.json
 restapi.sotn-attachment.templatefile=sotn-attachment-allotted-resource.json
 restapi.sdwan-attachment.templatefile=sdwan-attachment-allotted-resource.json
 restapi.oof-getpath.templatefile=oof-getpath.json
+restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json
 
 # URLs
 restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/
@@ -45,3 +49,4 @@ restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services
 restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}
 restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}
 restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/
+restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName

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 34896b7..2d05912 100644 (file)
--- 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,20 +1,20 @@
 [
     {
-        "id": "a0fcff67.f90228",
+        "id": "44384001.814478",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 87.14288330078125,
-        "y": 81.42857360839844,
-        "z": "719b1fb6.3a5b9",
+        "x": 112,
+        "y": 43,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "77ff7670.28ec1"
+                "7f8a6cfc.d713c4"
             ]
         ]
     },
     {
-        "id": "77ff7670.28ec1",
+        "id": "7f8a6cfc.d713c4",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2855 +22,2881 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 352.2857360839844,
-        "y": 81.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 359.1428527832031,
+        "y": 43.99999237060547,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "8198a596.8587a8"
+                "3e607973.034d6e"
             ]
         ]
     },
     {
-        "id": "8198a596.8587a8",
+        "id": "3e607973.034d6e",
         "type": "method",
         "name": "self-serve-generate-name",
         "xml": "<method rpc='self-serve-generate-name' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 657.2857360839844,
-        "y": 81.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 664.1428527832031,
+        "y": 43.99999237060547,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d1eee6c3.444198"
+                "3f9a35f8.8da52a"
             ]
         ]
     },
     {
-        "id": "d1eee6c3.444198",
+        "id": "3f9a35f8.8da52a",
         "type": "block",
         "name": "block atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 156.28573608398438,
-        "y": 167.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 163.14285278320312,
+        "y": 129.99999237060547,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "350eff4d.2e40a",
-                "e1ffb57d.53823",
-                "32827181.a6b956",
-                "de00c7d5.b7368"
+                "7a632215.c0ac2c",
+                "7f9a3712.0790f",
+                "f841aff3.13a07",
+                "571f0673.b8518",
+                "2a352877.19cd9"
             ]
         ]
     },
     {
-        "id": "a5d9b0a3.665e9",
+        "id": "bc633e83.bdfe98",
         "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.0000915527344,
-        "y": 893.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1728.8572082519531,
+        "y": 856.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "350eff4d.2e40a",
+        "id": "7a632215.c0ac2c",
         "type": "set",
         "name": "set capability-name",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\n",
         "comments": "",
-        "x": 355.2857360839844,
-        "y": 168.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 362.1428527832031,
+        "y": 130.99999237060547,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "e1ffb57d.53823",
+        "id": "7f9a3712.0790f",
         "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": 393.2857360839844,
-        "y": 233.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 391.1428527832031,
+        "y": 222,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "e6cffea2.05b508",
-                "d29f4ed4.70282"
+                "f5bead73.e939c8",
+                "e210e97d.997518"
             ]
         ]
     },
     {
-        "id": "c8ae8fb3.2b106",
+        "id": "f5e94169.5fc978",
         "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": 1155.785888671875,
-        "y": 524.8570861816406,
-        "z": "719b1fb6.3a5b9",
+        "x": 1162.6430053710938,
+        "y": 487.4285125732422,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "29db996f.2f77fe"
+                "fa4257ae.9fd718"
             ]
         ]
     },
     {
-        "id": "29db996f.2f77fe",
+        "id": "fa4257ae.9fd718",
         "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": 1398.6429443359375,
-        "y": 524.8570861816406,
-        "z": "719b1fb6.3a5b9",
+        "x": 1405.5000610351562,
+        "y": 487.4285125732422,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "fa3c082e.e81b98"
+                "4a6ecd53.d56884"
             ]
         ]
     },
     {
-        "id": "fa3c082e.e81b98",
+        "id": "4a6ecd53.d56884",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1579.3572998046875,
-        "y": 524.8570709228516,
-        "z": "719b1fb6.3a5b9",
+        "x": 1586.2144165039062,
+        "y": 487.4284973144531,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ecb50e0c.b6f238"
+                "a7c641d6.1516b"
             ]
         ]
     },
     {
-        "id": "9b45dec.f68242",
+        "id": "9750b026.40e79",
         "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": 1691.5000915527344,
-        "y": 694.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1698.3572082519531,
+        "y": 657.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "83953b14.cd3cc"
+                "6e26ff1a.e07b88"
             ]
         ]
     },
     {
-        "id": "e6cffea2.05b508",
+        "id": "f5bead73.e939c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 616.2857360839844,
-        "y": 201.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 614.1428527832031,
+        "y": 190,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "3bec3c36.db162c"
+                "322435c8.51411a"
             ]
         ]
     },
     {
-        "id": "d29f4ed4.70282",
+        "id": "e210e97d.997518",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 625.2857360839844,
-        "y": 267.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 623.1428527832031,
+        "y": 256,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "3bec3c36.db162c"
+                "322435c8.51411a"
             ]
         ]
     },
     {
-        "id": "3bec3c36.db162c",
+        "id": "322435c8.51411a",
         "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": 818.2857360839844,
-        "y": 201.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 816.1428527832031,
+        "y": 190,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "d44e28a5.a5361",
+        "id": "11ec24e5.5f86b3",
         "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;,'`\"/>",
+        "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": 2294.0000915527344,
-        "y": 692.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2300.857208251953,
+        "y": 655.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "561c14d8.97e21c",
+        "id": "bc87beaf.bad8a",
         "type": "set",
         "name": "set set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
         "comments": "",
-        "x": 1689.000244140625,
-        "y": 620.4284362792969,
-        "z": "719b1fb6.3a5b9",
+        "x": 1695.8573608398438,
+        "y": 582.9998626708984,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "755059e1.8e09a8",
+        "id": "3b24af37.62d288",
         "type": "set",
         "name": "set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
         "comments": "",
-        "x": 1689.0000915527344,
-        "y": 756.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1695.8572082519531,
+        "y": 719.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "bc43a903.45bae8",
+        "id": "a94779d8.6d99c",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1695.0000915527344,
-        "y": 821.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1701.8572082519531,
+        "y": 784.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "d6e4c46a.7a8e5",
+        "id": "349803e.db927fc",
         "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.0000915527344,
-        "y": 947.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1731.8572082519531,
+        "y": 910.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "87e249a7.d2d76",
-        "type": "execute",
-        "name": "execute NameGenerationNode-unassign",
-        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1751.0000915527344,
-        "y": 1004.5713424682617,
-        "z": "719b1fb6.3a5b9",
-        "wires": [
-            [
-                "e6a3bbe9.313368",
-                "77d6fd82.74cf9c"
-            ]
-        ]
-    },
-    {
-        "id": "e6a3bbe9.313368",
+        "id": "8af1d548.36ba08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2026.0000915527344,
-        "y": 954.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2097.857177734375,
+        "y": 932.1427612304688,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1105b68e.0b87b9"
+                "c7e4d145.feb3b8"
             ]
         ]
     },
     {
-        "id": "6b43378b.4fca7",
+        "id": "91f543dc.e9a0c8",
         "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": 2391.0000915527344,
-        "y": 1054.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2462.857177734375,
+        "y": 1032.1427612304688,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "77d6fd82.74cf9c",
+        "id": "6b5d2c36.36d07c",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2031.0000915527344,
-        "y": 1053.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2102.857177734375,
+        "y": 1031.1427612304688,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1105b68e.0b87b9"
+                "c7e4d145.feb3b8"
             ]
         ]
     },
     {
-        "id": "1105b68e.0b87b9",
+        "id": "c7e4d145.feb3b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2189.0000915527344,
-        "y": 998.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2260.857177734375,
+        "y": 976.1427612304688,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "6d474a1e.25ac34",
-                "6b43378b.4fca7"
+                "6effc421.de541c",
+                "91f543dc.e9a0c8"
             ]
         ]
     },
     {
-        "id": "6d474a1e.25ac34",
+        "id": "6effc421.de541c",
         "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": 2405.0000915527344,
-        "y": 945.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2476.857177734375,
+        "y": 923.1427612304688,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "d4160d84.70bb48",
+        "id": "4312cb34.d1fec4",
         "type": "switchNode",
         "name": "switch capability action assign",
         "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 779.5238037109375,
-        "y": 1652.1904296875,
-        "z": "719b1fb6.3a5b9",
+        "x": 786.3809204101562,
+        "y": 1614.7618560791016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "bf3e09f4.dafff"
+                "c588e672.9457"
             ]
         ]
     },
     {
-        "id": "bf3e09f4.dafff",
+        "id": "c588e672.9457",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1034.238037109375,
-        "y": 1652.1904296875,
-        "z": "719b1fb6.3a5b9",
+        "x": 1041.0951538085938,
+        "y": 1614.7618560791016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "6b713cfb.723974"
+                "96d8122d.bb415"
             ]
         ]
     },
     {
-        "id": "9c664d90.9ee95",
+        "id": "f5ff6d86.dbc2a8",
         "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": 1937.0000915527344,
-        "y": 1249.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1943.8572082519531,
+        "y": 1212.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1476063f.6bab8a"
+                "9f1d9384.e4cf38"
             ]
         ]
     },
     {
-        "id": "dbdeedbe.f41fd8",
+        "id": "e8412a7e.3847d8",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2140.0000915527344,
-        "y": 1467.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2146.857208251953,
+        "y": 1430.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "79a3b021.b0b288"
+                "32086d42.08bf12"
             ]
         ]
     },
     {
-        "id": "79a3b021.b0b288",
+        "id": "32086d42.08bf12",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2350.0000915527344,
-        "y": 1467.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2356.857208251953,
+        "y": 1430.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "be0571f0.89d93"
+                "8dd8a7af.a18a58"
             ]
         ]
     },
     {
-        "id": "be0571f0.89d93",
+        "id": "8dd8a7af.a18a58",
         "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": 2546.5000915527344,
-        "y": 1468.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2553.357208251953,
+        "y": 1431.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "3456afaf.a73238",
+        "id": "7ce3d216.f2e854",
         "type": "execute",
         "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "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.0000915527344,
-        "y": 1152.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1712.8572082519531,
+        "y": 1115.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e598157.0c9c38",
+        "id": "174f706f.eb1c4",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1699.0000915527344,
-        "y": 1248.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1705.8572082519531,
+        "y": 1211.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "9c664d90.9ee95"
+                "f5ff6d86.dbc2a8"
             ]
         ]
     },
     {
-        "id": "1476063f.6bab8a",
+        "id": "9f1d9384.e4cf38",
         "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": 2241.0000915527344,
-        "y": 1249.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2247.857208251953,
+        "y": 1212.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "61dff537.8d841c"
+                "ce97b583.de0eb"
             ]
         ]
     },
     {
-        "id": "61dff537.8d841c",
+        "id": "ce97b583.de0eb",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2481.0000915527344,
-        "y": 1248.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2487.857208251953,
+        "y": 1211.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1266c260.0a766e"
+                "2768322c.982d36"
             ]
         ]
     },
     {
-        "id": "ee43f6d5.8d77f8",
+        "id": "edf18693.d94aa8",
         "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": 2148.0000915527344,
-        "y": 1319.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2154.857208251953,
+        "y": 1282.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa6b38f9.769088",
+        "id": "ddf9d245.932de",
         "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": 2163.0000915527344,
-        "y": 1402.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2169.857208251953,
+        "y": 1365.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1266c260.0a766e",
+        "id": "2768322c.982d36",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1932.0000915527344,
-        "y": 1319.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1938.8572082519531,
+        "y": 1282.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ee43f6d5.8d77f8",
-                "aa6b38f9.769088",
-                "dbdeedbe.f41fd8"
+                "edf18693.d94aa8",
+                "ddf9d245.932de",
+                "e8412a7e.3847d8"
             ]
         ]
     },
     {
-        "id": "ecb50e0c.b6f238",
+        "id": "a7c641d6.1516b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1482.0000915527344,
-        "y": 620.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1488.8572082519531,
+        "y": 583.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "561c14d8.97e21c",
-                "9b45dec.f68242",
-                "755059e1.8e09a8",
-                "bc43a903.45bae8",
-                "a5d9b0a3.665e9",
-                "87e249a7.d2d76",
-                "3456afaf.a73238",
-                "8b2dbcd4.32fa2",
-                "5e598157.0c9c38",
-                "d6e4c46a.7a8e5"
+                "bc87beaf.bad8a",
+                "9750b026.40e79",
+                "3b24af37.62d288",
+                "a94779d8.6d99c",
+                "bc633e83.bdfe98",
+                "7ce3d216.f2e854",
+                "dcc81210.7b3bb",
+                "174f706f.eb1c4",
+                "349803e.db927fc",
+                "f9afd12e.2d3128"
             ]
         ]
     },
     {
-        "id": "8b2dbcd4.32fa2",
+        "id": "dcc81210.7b3bb",
         "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": 1704.0000915527344,
-        "y": 1202.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1710.8572082519531,
+        "y": 1165.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "27e20f71.6cc548",
+        "id": "fff738e5.4d0ce",
         "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": 1620.66650390625,
-        "y": 2137.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1627.5236206054688,
+        "y": 2099.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "10be84bb.581f9b",
+        "id": "16446b33.aaf505",
         "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": 1728.16650390625,
-        "y": 1953.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1735.0236206054688,
+        "y": 1915.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "8f7c2524.de50c"
+                "95c09049.cf0398"
             ]
         ]
     },
     {
-        "id": "8f7c2524.de50c",
+        "id": "95c09049.cf0398",
         "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;,'`\"/>",
+        "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": 1980.66650390625,
-        "y": 1953.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1987.5236206054688,
+        "y": 1915.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "c15c85cd.ea9f2",
+        "id": "278f5611.2443c2",
         "type": "set",
         "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n",
         "comments": "",
-        "x": 1709.094970703125,
-        "y": 1891.8093872070312,
-        "z": "719b1fb6.3a5b9",
+        "x": 1715.9520874023438,
+        "y": 1854.3808135986328,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "463d12f4.b57d9c",
+        "id": "b557bbbd.9b02a",
         "type": "set",
         "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
         "comments": "",
-        "x": 1710.66650390625,
-        "y": 2009.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1717.5236206054688,
+        "y": 1971.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "6a94f7b6.2e3e3",
+        "id": "88f11c7a.f31688",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1595.66650390625,
-        "y": 2094.0949096679688,
-        "z": "719b1fb6.3a5b9",
+        "x": 1602.5236206054688,
+        "y": 2056.6663360595703,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "9ffd6dac.5925a",
+        "id": "f398ae72.bb9338",
         "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": 1621.66650390625,
-        "y": 2188.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1628.5236206054688,
+        "y": 2150.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "18ddf882.11fd17",
-        "type": "execute",
-        "name": "execute NameGenerationNode-assign",
-        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1654.66650390625,
-        "y": 2245.094970703125,
-        "z": "719b1fb6.3a5b9",
-        "wires": [
-            [
-                "92a93214.de1db8",
-                "b360f358.424cc8"
-            ]
-        ]
-    },
-    {
-        "id": "92a93214.de1db8",
+        "id": "7136f5d4.61b024",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1929.66650390625,
-        "y": 2195.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1969.523681640625,
+        "y": 2184.66650390625,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "177b20fb.1bc74f"
+                "cce60393.cfd56"
             ]
         ]
     },
     {
-        "id": "3a3832be.f27146",
+        "id": "37abde73.8b06c2",
         "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": 2294.66650390625,
-        "y": 2295.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2334.523681640625,
+        "y": 2284.66650390625,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "b360f358.424cc8",
+        "id": "ef775b29.4a7b",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1934.66650390625,
-        "y": 2294.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1974.523681640625,
+        "y": 2283.66650390625,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "177b20fb.1bc74f"
+                "cce60393.cfd56"
             ]
         ]
     },
     {
-        "id": "177b20fb.1bc74f",
+        "id": "cce60393.cfd56",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2092.66650390625,
-        "y": 2239.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2132.523681640625,
+        "y": 2228.66650390625,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "9799610d.ba099",
-                "3a3832be.f27146"
+                "546fd473.2cd5dc",
+                "37abde73.8b06c2"
             ]
         ]
     },
     {
-        "id": "9799610d.ba099",
+        "id": "546fd473.2cd5dc",
         "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": 2308.66650390625,
-        "y": 2186.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2348.523681640625,
+        "y": 2175.66650390625,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "37785a2.d8ea0a6",
+        "id": "e2624cc8.4eb57",
         "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": 1841.66650390625,
-        "y": 2445.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1848.5236206054688,
+        "y": 2407.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "10461664.c280c2"
+                "be8a0258.a3d64"
             ]
         ]
     },
     {
-        "id": "ddf9ee24.32721",
+        "id": "5380bfed.f4864",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2044.66650390625,
-        "y": 2663.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2051.5236206054688,
+        "y": 2625.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "915c127.869707"
+                "94a6c10b.d1c6a"
             ]
         ]
     },
     {
-        "id": "915c127.869707",
+        "id": "94a6c10b.d1c6a",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2254.66650390625,
-        "y": 2663.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2261.5236206054688,
+        "y": 2625.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "3e3270b5.18b048"
+                "7afdb21d.b59cb4"
             ]
         ]
     },
     {
-        "id": "3e3270b5.18b048",
+        "id": "7afdb21d.b59cb4",
         "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": 2451.16650390625,
-        "y": 2664.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2458.0236206054688,
+        "y": 2626.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "a0734951.e43bb8",
+        "id": "6d5e56ed.17d75",
         "type": "execute",
         "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "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": 1602.66650390625,
-        "y": 2347.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1609.5236206054688,
+        "y": 2309.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9976393.8117548",
+        "id": "a133146c.f8d1c",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594.66650390625,
-        "y": 2444.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1601.5236206054688,
+        "y": 2406.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "37785a2.d8ea0a6"
+                "e2624cc8.4eb57"
             ]
         ]
     },
     {
-        "id": "10461664.c280c2",
+        "id": "be8a0258.a3d64",
         "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": 2145.66650390625,
-        "y": 2445.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2152.5236206054688,
+        "y": 2407.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "41922990.8a02f"
+                "663752cc.bb14ac"
             ]
         ]
     },
     {
-        "id": "41922990.8a02f",
+        "id": "663752cc.bb14ac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385.66650390625,
-        "y": 2444.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2392.5236206054688,
+        "y": 2406.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "306d8cff.17a97c"
+                "5dfb8377.41af4c"
             ]
         ]
     },
     {
-        "id": "82f3e171.12001",
+        "id": "f365dac0.f6fd5",
         "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": 2052.66650390625,
-        "y": 2515.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2059.5236206054688,
+        "y": 2477.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a6ff351.59e66c",
+        "id": "f61ff7c0.095698",
         "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": 2067.66650390625,
-        "y": 2598.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2074.5236206054688,
+        "y": 2560.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "306d8cff.17a97c",
+        "id": "5dfb8377.41af4c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1836.66650390625,
-        "y": 2515.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1843.5236206054688,
+        "y": 2477.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "82f3e171.12001",
-                "7a6ff351.59e66c",
-                "ddf9ee24.32721"
+                "f365dac0.f6fd5",
+                "f61ff7c0.095698",
+                "5380bfed.f4864"
             ]
         ]
     },
     {
-        "id": "6ed8d498.9723f4",
+        "id": "4849f457.b71524",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1505.8095703125,
-        "y": 1871.380615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1512.6666870117188,
+        "y": 1833.9520416259766,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "c15c85cd.ea9f2",
-                "10be84bb.581f9b",
-                "463d12f4.b57d9c"
+                "278f5611.2443c2",
+                "16446b33.aaf505",
+                "b557bbbd.9b02a"
             ]
         ]
     },
     {
-        "id": "c0cd44d1.7422",
+        "id": "a0bc5db0.876ac8",
         "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": 1601.66650390625,
-        "y": 2398.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1608.5236206054688,
+        "y": 2360.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "83953b14.cd3cc",
+        "id": "6e26ff1a.e07b88",
         "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": 1930.0000915527344,
-        "y": 693.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 1936.8572082519531,
+        "y": 656.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "6b9e4dcc.d7de0c"
+                "983c7546.c67c28"
             ]
         ]
     },
     {
-        "id": "6b9e4dcc.d7de0c",
+        "id": "983c7546.c67c28",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2114.0000915527344,
-        "y": 693.5713424682617,
-        "z": "719b1fb6.3a5b9",
+        "x": 2120.857208251953,
+        "y": 656.1427688598633,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d44e28a5.a5361"
+                "11ec24e5.5f86b3"
             ]
         ]
     },
     {
-        "id": "763cbc48.beee84",
+        "id": "d8da45ad.01a8a",
         "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": 1841.619140625,
-        "y": 4107.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1848.4762573242188,
+        "y": 4070.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f26ae3f9.58a6a8",
+        "id": "a3bde9b.3b85798",
         "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": 1130.1190185546875,
-        "y": 3719.761962890625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1136.9761352539062,
+        "y": 3682.3333892822266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "19fb9704.e19821"
+                "4c84b197.b55718"
             ]
         ]
     },
     {
-        "id": "19fb9704.e19821",
+        "id": "4c84b197.b55718",
         "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": 1410.1190185546875,
-        "y": 3719.761962890625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1416.9761352539062,
+        "y": 3682.3333892822266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "3b748ba2.5ca9c4"
+                "8fbf4fc0.ccf628"
             ]
         ]
     },
     {
-        "id": "3b748ba2.5ca9c4",
+        "id": "8fbf4fc0.ccf628",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1619.119140625,
-        "y": 3719.761962890625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1625.9762573242188,
+        "y": 3682.3333892822266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "fe9fb952.03865"
+                "37468c59.dd2414"
             ]
         ]
     },
     {
-        "id": "a3efff0f.aa4ec8",
+        "id": "97197bdb.a2cad8",
         "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": 1811.119140625,
-        "y": 3908.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1817.9762573242188,
+        "y": 3871.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "411e99fd.a39438"
+                "3908bfeb.e84f"
             ]
         ]
     },
     {
-        "id": "9abfe611.4545c8",
+        "id": "28d4f278.d4fa26",
         "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;,'`\"/>",
+        "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": 2413.619140625,
-        "y": 3906.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2420.4762573242188,
+        "y": 3869.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "ed0277b1.5970a",
+        "id": "73a75422.d8850c",
         "type": "set",
         "name": "set set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />\n<parameter name='tmp.gen-name_length' value='1' />",
         "comments": "",
-        "x": 1808.619140625,
-        "y": 3831.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1815.4762573242188,
+        "y": 3794.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "8bbcc0bf.293ef8",
+        "id": "46fb189c.966838",
         "type": "set",
         "name": "set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
         "comments": "",
-        "x": 1808.619140625,
-        "y": 3970.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1815.4762573242188,
+        "y": 3933.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "d5dd6ae4.c76cb8",
+        "id": "be439e05.fe7ff8",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1814.619140625,
-        "y": 4035.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1821.4762573242188,
+        "y": 3998.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "a8bf6cef.175b98",
+        "id": "a84918b5.b82848",
         "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": 1844.619140625,
-        "y": 4161.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1851.4762573242188,
+        "y": 4124.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "452bff82.4ad42",
-        "type": "execute",
-        "name": "execute NameGenerationNode-unassign",
-        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1870.619140625,
-        "y": 4218.761474609375,
-        "z": "719b1fb6.3a5b9",
-        "wires": [
-            [
-                "12b87141.01ce77",
-                "da1a35af.b4fb48"
-            ]
-        ]
-    },
-    {
-        "id": "12b87141.01ce77",
+        "id": "e6db3fc2.418c7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2145.619140625,
-        "y": 4168.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2181.476318359375,
+        "y": 4146.3330078125,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d6576013.79b6e"
+                "c89f9697.3bcd9"
             ]
         ]
     },
     {
-        "id": "8bddd10d.aa37",
+        "id": "54902e1f.a23738",
         "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": 2510.619140625,
-        "y": 4268.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2546.476318359375,
+        "y": 4246.3330078125,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "da1a35af.b4fb48",
+        "id": "add1de2.24bbda",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2150.619140625,
-        "y": 4267.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2186.476318359375,
+        "y": 4245.3330078125,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d6576013.79b6e"
+                "c89f9697.3bcd9"
             ]
         ]
     },
     {
-        "id": "d6576013.79b6e",
+        "id": "c89f9697.3bcd9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2308.619140625,
-        "y": 4212.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2344.476318359375,
+        "y": 4190.3330078125,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d5fbd703.684a6",
-                "8bddd10d.aa37"
+                "ed1d207b.66697",
+                "54902e1f.a23738"
             ]
         ]
     },
     {
-        "id": "d5fbd703.684a6",
+        "id": "ed1d207b.66697",
         "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": 2524.619140625,
-        "y": 4159.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2560.476318359375,
+        "y": 4137.3330078125,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "979f7afd.afba98",
+        "id": "712165ae.c8b134",
         "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": 2056.619140625,
-        "y": 4463.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2063.4762573242188,
+        "y": 4426.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "648836d6.70a21"
+                "a8831bf.0add2e8"
             ]
         ]
     },
     {
-        "id": "8ff2df62.ffbde",
+        "id": "c4d874bf.c84648",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2259.619140625,
-        "y": 4681.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2266.4762573242188,
+        "y": 4644.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "78ff017c.17864"
+                "6c8538a0.f116f8"
             ]
         ]
     },
     {
-        "id": "78ff017c.17864",
+        "id": "6c8538a0.f116f8",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2469.619140625,
-        "y": 4681.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2476.4762573242188,
+        "y": 4644.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1462085a.8135a"
+                "4ab33b35.a84a54"
             ]
         ]
     },
     {
-        "id": "1462085a.8135a",
+        "id": "4ab33b35.a84a54",
         "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": 2666.119140625,
-        "y": 4682.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2672.9762573242188,
+        "y": 4645.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "5bd4041e.5eb064",
+        "id": "2bae3b0b.919654",
         "type": "execute",
         "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "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": 1825.619140625,
-        "y": 4366.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1832.4762573242188,
+        "y": 4329.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d49e444f.57b07",
+        "id": "bd0c0aec.c12ba",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1818.619140625,
-        "y": 4462.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1825.4762573242188,
+        "y": 4425.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "979f7afd.afba98"
+                "712165ae.c8b134"
             ]
         ]
     },
     {
-        "id": "648836d6.70a21",
+        "id": "a8831bf.0add2e8",
         "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": 2360.619140625,
-        "y": 4463.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2367.4762573242188,
+        "y": 4426.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "7a9d7c8a.3c0bc4"
+                "b4bafecc.dbd1d8"
             ]
         ]
     },
     {
-        "id": "7a9d7c8a.3c0bc4",
+        "id": "b4bafecc.dbd1d8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2600.619140625,
-        "y": 4462.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2607.4762573242188,
+        "y": 4425.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "2051ec8a.8af274"
+                "37f99340.6371ac"
             ]
         ]
     },
     {
-        "id": "999690dc.8426f8",
+        "id": "c6f61ac6.058e2",
         "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": 2267.619140625,
-        "y": 4533.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2274.4762573242188,
+        "y": 4496.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5bc42c8c.88381c",
+        "id": "7b6510ed.263a5",
         "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": 2282.619140625,
-        "y": 4616.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2289.4762573242188,
+        "y": 4579.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2051ec8a.8af274",
+        "id": "37f99340.6371ac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2051.619140625,
-        "y": 4533.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2058.4762573242188,
+        "y": 4496.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "999690dc.8426f8",
-                "5bc42c8c.88381c",
-                "8ff2df62.ffbde"
+                "c6f61ac6.058e2",
+                "7b6510ed.263a5",
+                "c4d874bf.c84648"
             ]
         ]
     },
     {
-        "id": "fe9fb952.03865",
+        "id": "37468c59.dd2414",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1601.619140625,
-        "y": 3834.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1608.4762573242188,
+        "y": 3797.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ed0277b1.5970a",
-                "a3efff0f.aa4ec8",
-                "8bbcc0bf.293ef8",
-                "d5dd6ae4.c76cb8",
-                "763cbc48.beee84",
-                "452bff82.4ad42",
-                "5bd4041e.5eb064",
-                "9a62d212.fe282",
-                "d49e444f.57b07",
-                "a8bf6cef.175b98"
+                "73a75422.d8850c",
+                "97197bdb.a2cad8",
+                "46fb189c.966838",
+                "be439e05.fe7ff8",
+                "d8da45ad.01a8a",
+                "2bae3b0b.919654",
+                "6650d50f.f2a194",
+                "bd0c0aec.c12ba",
+                "a84918b5.b82848",
+                "99585b38.25a06"
             ]
         ]
     },
     {
-        "id": "9a62d212.fe282",
+        "id": "6650d50f.f2a194",
         "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": 1823.619140625,
-        "y": 4416.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1830.4762573242188,
+        "y": 4379.332901000977,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "411e99fd.a39438",
+        "id": "3908bfeb.e84f",
         "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": 2049.619140625,
-        "y": 3907.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2056.4762573242188,
+        "y": 3870.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "73c6b2a8.a3b054"
+                "5a34ee8b.f9c61"
             ]
         ]
     },
     {
-        "id": "73c6b2a8.a3b054",
+        "id": "5a34ee8b.f9c61",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2233.619140625,
-        "y": 3907.761474609375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2240.4762573242188,
+        "y": 3870.3329010009766,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "9abfe611.4545c8"
+                "28d4f278.d4fa26"
             ]
         ]
     },
     {
-        "id": "32827181.a6b956",
+        "id": "f841aff3.13a07",
         "type": "switchNode",
         "name": "switch capability-type. vnf",
         "xml": "<switch test=\"`$ss.capability-type == 'vnf'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 365.2857360839844,
-        "y": 338.4285659790039,
-        "z": "719b1fb6.3a5b9",
+        "x": 372.1428527832031,
+        "y": 300.99999237060547,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "524e830f.6470c4"
+                "58dd98ce.eb99f"
             ]
         ]
     },
     {
-        "id": "524e830f.6470c4",
+        "id": "58dd98ce.eb99f",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 568.7142944335938,
-        "y": 337.71429443359375,
-        "z": "719b1fb6.3a5b9",
+        "x": 575.5714111328125,
+        "y": 300.2857208251953,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ef52847b.ff229"
+                "7b0e8ad8.f3802c"
             ]
         ]
     },
     {
-        "id": "de00c7d5.b7368",
+        "id": "571f0673.b8518",
         "type": "switchNode",
         "name": "switch capability-type vf-module",
         "xml": "<switch test=\"`$ss.capability-type == 'vf-module'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 494.61907958984375,
-        "y": 3501.7619018554688,
-        "z": "719b1fb6.3a5b9",
+        "x": 501.4761962890625,
+        "y": 3464.3333282470703,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1ded1ea.e9121e1"
+                "48a38bbd.e8a77c"
             ]
         ]
     },
     {
-        "id": "1ded1ea.e9121e1",
+        "id": "48a38bbd.e8a77c",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 713.6190795898438,
-        "y": 3502.761962890625,
-        "z": "719b1fb6.3a5b9",
+        "x": 720.4761962890625,
+        "y": 3465.3333892822266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "c14ba9b4.7c8ad8"
+                "750bfd10.899924"
             ]
         ]
     },
     {
-        "id": "36603013.bbb4f8",
+        "id": "a6e4bc7d.20b678",
         "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": 1606.66650390625,
-        "y": 2624.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1613.5236206054688,
+        "y": 2586.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "a6ad8f3a.9c7f8"
+                "ffc03440.e917d"
             ]
         ]
     },
     {
-        "id": "a6ad8f3a.9c7f8",
+        "id": "ffc03440.e917d",
         "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": 1732.3331298828125,
-        "y": 2755.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1739.1902465820312,
+        "y": 2717.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "77a82966.ec0b48"
+                "1af41882.7a6b4f"
             ]
         ]
     },
     {
-        "id": "77a82966.ec0b48",
+        "id": "1af41882.7a6b4f",
         "type": "failure",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1994.3331298828125,
-        "y": 2811.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2001.1902465820312,
+        "y": 2773.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "f33d0266.cea3"
+                "fcd660c4.530c58"
             ]
         ]
     },
     {
-        "id": "f33d0266.cea3",
+        "id": "fcd660c4.530c58",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2210.3331298828125,
-        "y": 2811.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2217.1902465820312,
+        "y": 2773.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "bd9f5006.39331",
-                "1847b82e.cbd13"
+                "236c01c7.bf3206",
+                "bd4596a.19984e8"
             ]
         ]
     },
     {
-        "id": "bd9f5006.39331",
+        "id": "236c01c7.bf3206",
         "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": 2430.3331298828125,
-        "y": 2749.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2437.1902465820312,
+        "y": 2711.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "1847b82e.cbd13",
+        "id": "bd4596a.19984e8",
         "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": 2440.3331298828125,
-        "y": 2857.094970703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2447.1902465820312,
+        "y": 2819.6663970947266,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "bc970fe5.a522f8",
+        "id": "4bd2a625.600b48",
         "type": "switchNode",
         "name": "switch capability action unassign",
         "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 822.8571166992188,
-        "y": 428.5714416503906,
-        "z": "719b1fb6.3a5b9",
+        "x": 829.7142333984375,
+        "y": 391.1428680419922,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "e1f81f5d.07ca4"
+                "f5867b52.e6b6c"
             ]
         ]
     },
     {
-        "id": "e1f81f5d.07ca4",
+        "id": "f5867b52.e6b6c",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1108.5714111328125,
-        "y": 427.1428527832031,
-        "z": "719b1fb6.3a5b9",
+        "x": 1115.4285278320312,
+        "y": 389.7142791748047,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "c8ae8fb3.2b106"
+                "f5e94169.5fc978"
             ]
         ]
     },
     {
-        "id": "ef52847b.ff229",
+        "id": "7b0e8ad8.f3802c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 572.857177734375,
-        "y": 402.857177734375,
-        "z": "719b1fb6.3a5b9",
+        "x": 579.7142944335938,
+        "y": 365.42860412597656,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "bc970fe5.a522f8",
-                "d4160d84.70bb48"
+                "4bd2a625.600b48",
+                "4312cb34.d1fec4"
             ]
         ]
     },
     {
-        "id": "80902f6b.f3783",
+        "id": "acaab3ca.702c88",
         "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": 1047.2144775390625,
-        "y": 1814.5953369140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1054.0715942382812,
+        "y": 1777.166763305664,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "504c0e8f.4cc8a"
+                "ae04112f.bd2d08"
             ]
         ]
     },
     {
-        "id": "504c0e8f.4cc8a",
+        "id": "ae04112f.bd2d08",
         "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": 1288.821533203125,
-        "y": 1814.5953369140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1295.6786499023438,
+        "y": 1777.166763305664,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "98b667d2.9e63f8"
+                "1e81a1ec.bd42f6"
             ]
         ]
     },
     {
-        "id": "98b667d2.9e63f8",
+        "id": "1e81a1ec.bd42f6",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1469.535888671875,
-        "y": 1814.5953369140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1476.3930053710938,
+        "y": 1777.166763305664,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "6ed8d498.9723f4"
+                "4849f457.b71524"
             ]
         ]
     },
     {
-        "id": "10288042.9afdc",
+        "id": "d951a688.ea8908",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1202.0001220703125,
-        "y": 3631,
-        "z": "719b1fb6.3a5b9",
+        "x": 1208.8572387695312,
+        "y": 3593.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "f26ae3f9.58a6a8"
+                "a3bde9b.3b85798"
             ]
         ]
     },
     {
-        "id": "ae383e92.c64418",
+        "id": "90ab2ac1.82262",
         "type": "switchNode",
         "name": "switch capability action unassign",
         "xml": "<switch test=\"`$ss.capability-action == 'unassign'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 960.9998779296875,
-        "y": 3631,
-        "z": "719b1fb6.3a5b9",
+        "x": 967.8569946289062,
+        "y": 3593.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "10288042.9afdc"
+                "d951a688.ea8908"
             ]
         ]
     },
     {
-        "id": "c14ba9b4.7c8ad8",
+        "id": "750bfd10.899924",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 718,
-        "y": 3568,
-        "z": "719b1fb6.3a5b9",
+        "x": 724.8571166992188,
+        "y": 3530.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ae383e92.c64418",
-                "b1d4f02b.074b08"
+                "90ab2ac1.82262",
+                "876d4c7d.f86a88"
             ]
         ]
     },
     {
-        "id": "b1d4f02b.074b08",
+        "id": "876d4c7d.f86a88",
         "type": "switchNode",
         "name": "switch capability action assign",
         "xml": "<switch test=\"`$ss.capability-action == 'assign'`\">",
         "comments": "",
         "outputs": 1,
-        "x": 937.9525146484375,
-        "y": 5238.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 944.8096313476562,
+        "y": 5201.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "5f3175ef.b2e644"
+                "97b1b31a.f402b"
             ]
         ]
     },
     {
-        "id": "5f3175ef.b2e644",
+        "id": "97b1b31a.f402b",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1166.9525146484375,
-        "y": 5238.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1173.8096313476562,
+        "y": 5201.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "7f8df3af.553754"
+                "bf89c636.30aac8"
             ]
         ]
     },
     {
-        "id": "b52f5f26.c98fb",
+        "id": "c54c6f8e.b8ff58",
         "type": "execute",
         "name": "execute replace extra comma",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace'>\n   <parameter name='outputPath' value='tmp.naming-data-payload' />\n   <parameter name='source' value='`$tmp.naming-data-payload`' />\n   <parameter name='target' value=',}' />\n   <parameter name='replacement' value='}' />",
         "comments": "",
         "outputs": 1,
-        "x": 1715.452392578125,
-        "y": 5709.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1722.3095092773438,
+        "y": 5671.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "21cc2c07.2e17cc",
+        "id": "b361600c.eb049",
         "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": 2033.702392578125,
-        "y": 5516.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2040.5595092773438,
+        "y": 5479.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d6c21c77.670988"
+                "b5cdeaa7.6f11d"
             ]
         ]
     },
     {
-        "id": "d6c21c77.670988",
+        "id": "b5cdeaa7.6f11d",
         "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;,'`\"/>",
+        "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": 2290.202392578125,
-        "y": 5516.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2297.0595092773438,
+        "y": 5479.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "b09f0c88.a8dd8",
+        "id": "8bb2899.7eabb78",
         "type": "set",
         "name": "set set payload data",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '{'`\" />",
         "comments": "",
-        "x": 2016.202392578125,
-        "y": 5462.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2023.0595092773438,
+        "y": 5425.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "16aca9a0.b085ce",
+        "id": "feb610d7.764ab",
         "type": "set",
         "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />",
+        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + '},'`\" />\n<parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />",
         "comments": "",
-        "x": 2022.202392578125,
-        "y": 5578.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 2029.0595092773438,
+        "y": 5541.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "1fd7b0ea.d78def",
+        "id": "aba737c8.b673a",
         "type": "set",
         "name": "set close payload list",
         "xml": "<set>\n<parameter name='tmp.naming-data-payload' value=\"`$tmp.naming-data-payload + ']}'`\" />",
         "comments": "",
-        "x": 1685.452392578125,
-        "y": 5658.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1692.3095092773438,
+        "y": 5620.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "382244f1.84c314",
+        "id": "e94ef6dd.a37908",
         "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": 1718.452392578125,
-        "y": 5763.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1725.3095092773438,
+        "y": 5725.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1e358e4.0f1af8",
-        "type": "execute",
-        "name": "execute NameGenerationNode-assign",
-        "xml": "<execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\n   <parameter name='payload' value='`$tmp.naming-data-payload`' />\n   <parameter name=\"prifix\" value=\"nameGenResponse\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1744.452392578125,
-        "y": 5820.0130615234375,
-        "z": "719b1fb6.3a5b9",
-        "wires": [
-            [
-                "1e42490a.0702a7",
-                "1ec1c7ac.f1fe98"
-            ]
-        ]
-    },
-    {
-        "id": "1e42490a.0702a7",
+        "id": "1ec3d3c3.85586c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2019.452392578125,
-        "y": 5770.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2028.3095703125,
+        "y": 5739.58447265625,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1dc6c6ec.4b2119"
+                "21b0f329.fc401c"
             ]
         ]
     },
     {
-        "id": "c05d5782.207da8",
+        "id": "7a611dc7.f16d14",
         "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": 2384.452392578125,
-        "y": 5870.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2393.3095703125,
+        "y": 5839.58447265625,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "1ec1c7ac.f1fe98",
+        "id": "80386656.f0d7d",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2024.452392578125,
-        "y": 5869.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2033.3095703125,
+        "y": 5838.58447265625,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1dc6c6ec.4b2119"
+                "21b0f329.fc401c"
             ]
         ]
     },
     {
-        "id": "1dc6c6ec.4b2119",
+        "id": "21b0f329.fc401c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2182.452392578125,
-        "y": 5814.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2191.3095703125,
+        "y": 5783.58447265625,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "c05d5782.207da8",
-                "e913f4eb.f584"
+                "7a611dc7.f16d14",
+                "399dfaf7.a00f2e"
             ]
         ]
     },
     {
-        "id": "e913f4eb.f584",
+        "id": "399dfaf7.a00f2e",
         "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": 2398.452392578125,
-        "y": 5761.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2407.3095703125,
+        "y": 5730.58447265625,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "3d332c56.43f43c",
+        "id": "8744b72d.e0422",
         "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": 1996.452392578125,
-        "y": 6353.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2003.3095092773438,
+        "y": 6315.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "5f0db49f.fd8454"
+                "26376a44.3bf3e6"
             ]
         ]
     },
     {
-        "id": "d9f8a4b0.d2e5c",
+        "id": "c8297614.5665c8",
         "type": "switchNode",
         "name": "switch capability-name",
         "xml": "<switch test='`$s2[0] == $jsonContextPrefix.elements[$n].resource-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2167.452392578125,
-        "y": 6511.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2174.3095092773438,
+        "y": 6473.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "f6bd7605.4d5f48"
+                "5c1866b1.7ab59"
             ]
         ]
     },
     {
-        "id": "f6bd7605.4d5f48",
+        "id": "5c1866b1.7ab59",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2371.452392578125,
-        "y": 6509.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2378.3095092773438,
+        "y": 6471.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "74b43ff2.601cb"
+                "8068dba1.b90f38"
             ]
         ]
     },
     {
-        "id": "74b43ff2.601cb",
+        "id": "8068dba1.b90f38",
         "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": 2565.952392578125,
-        "y": 6442.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2572.8095092773438,
+        "y": 6404.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "8f868b5c.16e278",
+        "id": "cbc78ec6.7ff248",
         "type": "execute",
         "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"nameGenResponse.response-payload\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n",
+        "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": 1699.452392578125,
-        "y": 5876.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1706.3095092773438,
+        "y": 5838.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "20e95425.2ec68c",
+        "id": "1e5d91b7.f1cac6",
         "type": "for",
         "name": "for response elements",
         "xml": "<for index='n' start='0' end='`$jsonContextPrefix.elements_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728.452392578125,
-        "y": 6354.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1735.3095092773438,
+        "y": 6316.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "3d332c56.43f43c"
+                "8744b72d.e0422"
             ]
         ]
     },
     {
-        "id": "5f0db49f.fd8454",
+        "id": "26376a44.3bf3e6",
         "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": 2280.452392578125,
-        "y": 6357.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2287.3095092773438,
+        "y": 6319.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "e81d08ce.9ec57"
+                "6638dc1c.c0f774"
             ]
         ]
     },
     {
-        "id": "e81d08ce.9ec57",
+        "id": "6638dc1c.c0f774",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2508.452392578125,
-        "y": 6354.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2515.3095092773438,
+        "y": 6316.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "4dc60b03.30474c"
+                "49c6c4cb.ae35f4"
             ]
         ]
     },
     {
-        "id": "d9a4aa95.7b85",
+        "id": "614640d1.2410b",
         "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": 2175.452392578125,
-        "y": 6407.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2182.3095092773438,
+        "y": 6369.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ebcca07.69da94",
+        "id": "f159cc8b.de17d",
         "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": 2188.452392578125,
-        "y": 6466.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2195.3095092773438,
+        "y": 6428.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4dc60b03.30474c",
+        "id": "49c6c4cb.ae35f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1935.452392578125,
-        "y": 6433.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1942.3095092773438,
+        "y": 6395.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d9f8a4b0.d2e5c",
-                "d9a4aa95.7b85",
-                "7ebcca07.69da94"
+                "c8297614.5665c8",
+                "614640d1.2410b",
+                "f159cc8b.de17d"
             ]
         ]
     },
     {
-        "id": "d4e4d3cb.8e365",
+        "id": "80097c84.1bbc38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1809.202392578125,
-        "y": 5465.7626953125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1816.0595092773438,
+        "y": 5428.334121704102,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "21cc2c07.2e17cc",
-                "b09f0c88.a8dd8",
-                "16aca9a0.b085ce"
+                "b361600c.eb049",
+                "8bb2899.7eabb78",
+                "feb610d7.764ab"
             ]
         ]
     },
     {
-        "id": "c761a7c.6b8ed58",
+        "id": "d085846f.259da",
         "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": 1701.452392578125,
-        "y": 5928.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1708.3095092773438,
+        "y": 5890.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "64f6b871.04fb28",
+        "id": "2d4ee971.9f5306",
         "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": 1723.452392578125,
-        "y": 6576.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1730.3095092773438,
+        "y": 6538.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "74477622.de12d"
+                "968d7f58.752fa8"
             ]
         ]
     },
     {
-        "id": "74477622.de12d",
+        "id": "968d7f58.752fa8",
         "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": 2029.452392578125,
-        "y": 6574.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2036.3095092773438,
+        "y": 6536.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "59f6f125.780478"
+                "b316390f.c223e"
             ]
         ]
     },
     {
-        "id": "59f6f125.780478",
+        "id": "b316390f.c223e",
         "type": "failure",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2267.452392578125,
-        "y": 6574.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2274.3095092773438,
+        "y": 6536.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "f3d21584.7ce7b8"
+                "523d1dc3.a4cfdc"
             ]
         ]
     },
     {
-        "id": "f3d21584.7ce7b8",
+        "id": "523d1dc3.a4cfdc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2429.452392578125,
-        "y": 6568.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2436.3095092773438,
+        "y": 6530.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "2c8c0702.854ee8",
-                "fa294e63.602d08"
+                "196036c5.88ba19",
+                "a33c55dc.d6268"
             ]
         ]
     },
     {
-        "id": "2c8c0702.854ee8",
+        "id": "196036c5.88ba19",
         "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": 2653.452392578125,
-        "y": 6534.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2660.3095092773438,
+        "y": 6496.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "fa294e63.602d08",
+        "id": "a33c55dc.d6268",
         "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": 2641.452392578125,
-        "y": 6634.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2648.3095092773438,
+        "y": 6596.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "4bd004e3.7dd99c",
+        "id": "af0954c0.0ed2a8",
         "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": 1711.452392578125,
-        "y": 6034.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1718.3095092773438,
+        "y": 5996.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "85c7441c.53c08"
+                "fcdfe07c.36982"
             ]
         ]
     },
     {
-        "id": "85c7441c.53c08",
+        "id": "fcdfe07c.36982",
         "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": 1964.952392578125,
-        "y": 6035.013427734375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1971.8095092773438,
+        "y": 5997.584854125977,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "b4e69f12.2126f8"
+                "ecb5c713.928a5"
             ]
         ]
     },
     {
-        "id": "b4e69f12.2126f8",
+        "id": "ecb5c713.928a5",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2157.952392578125,
-        "y": 6035.5133056640625,
-        "z": "719b1fb6.3a5b9",
+        "x": 2164.8095092773438,
+        "y": 5998.084732055664,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1fdd7e1e.c75b82"
+                "a271047.93a13f8"
             ]
         ]
     },
     {
-        "id": "1fdd7e1e.c75b82",
+        "id": "a271047.93a13f8",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1799.452392578125,
-        "y": 6150.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 1806.3095092773438,
+        "y": 6112.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "e34d6504.04ef68"
+                "a54bbb54.f3ff88"
             ]
         ]
     },
     {
-        "id": "e34d6504.04ef68",
+        "id": "a54bbb54.f3ff88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2071.452392578125,
-        "y": 6146.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2078.3095092773438,
+        "y": 6108.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "8427815.e49c28",
-                "7720c796.cf51d",
-                "14b77c36.339774",
-                "db75ea42.1350d",
-                "6061ffc.9494f",
-                "15f23c59.7c19e4",
-                "e7c83d46.a2ef48"
+                "7a50c097.1fd508",
+                "bae1a795.c95818",
+                "6cb03d6a.b426e4",
+                "fdef5f45.af46b8",
+                "d977a0bb.d25038",
+                "d4543380.8a8648",
+                "80d478e2.ca4f3"
             ]
         ]
     },
     {
-        "id": "7720c796.cf51d",
+        "id": "bae1a795.c95818",
         "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": 2509.452392578125,
-        "y": 6022.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2516.3095092773438,
+        "y": 5984.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "6857d48.2b9c62c"
+                "e21bbc33.3bd9b8"
             ]
         ]
     },
     {
-        "id": "14b77c36.339774",
+        "id": "6cb03d6a.b426e4",
         "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": 2477.452392578125,
-        "y": 6080.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2484.3095092773438,
+        "y": 6042.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "36c572f8.11887e"
+                "26752abf.e0f87e"
             ]
         ]
     },
     {
-        "id": "db75ea42.1350d",
+        "id": "fdef5f45.af46b8",
         "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": 2475.452392578125,
-        "y": 6142.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2482.3095092773438,
+        "y": 6104.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "992d2ec6.0f6bf8"
+                "99545f4f.9552"
             ]
         ]
     },
     {
-        "id": "6061ffc.9494f",
+        "id": "d977a0bb.d25038",
         "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": 2483.452392578125,
-        "y": 6204.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2490.3095092773438,
+        "y": 6166.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ddbe5eba.fbf8d8"
+                "d332c105.d01b6"
             ]
         ]
     },
     {
-        "id": "8427815.e49c28",
+        "id": "7a50c097.1fd508",
         "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": 2499.452392578125,
-        "y": 5950.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2506.3095092773438,
+        "y": 5912.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "481f3b2.962dd44"
+                "343730f6.0bde"
             ]
         ]
     },
     {
-        "id": "481f3b2.962dd44",
+        "id": "343730f6.0bde",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2703.452392578125,
-        "y": 5946.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2710.3095092773438,
+        "y": 5908.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "9d2fa840.0363b"
+                "10dcd678.f75eb2"
             ]
         ]
     },
     {
-        "id": "6857d48.2b9c62c",
+        "id": "e21bbc33.3bd9b8",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2703.452392578125,
-        "y": 6020.2630615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2710.3095092773438,
+        "y": 5982.834487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1fb07fdb.0d632"
+                "ba46d15f.84fe98"
             ]
         ]
     },
     {
-        "id": "36c572f8.11887e",
+        "id": "26752abf.e0f87e",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2709.452392578125,
-        "y": 6076.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2716.3095092773438,
+        "y": 6038.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "a0d68506.3f9068"
+                "ec7f1ff2.18d6b8"
             ]
         ]
     },
     {
-        "id": "992d2ec6.0f6bf8",
+        "id": "99545f4f.9552",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2713.452392578125,
-        "y": 6134.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2720.3095092773438,
+        "y": 6096.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "5459f399.0fb614"
+                "9cb30ad2.947f6"
             ]
         ]
     },
     {
-        "id": "ddbe5eba.fbf8d8",
+        "id": "d332c105.d01b6",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2719.452392578125,
-        "y": 6200.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2726.3095092773438,
+        "y": 6162.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "29fd0e8b.8c7952"
+                "78957203.1f8534"
             ]
         ]
     },
     {
-        "id": "9d2fa840.0363b",
+        "id": "10dcd678.f75eb2",
         "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": 2867.452392578125,
-        "y": 5948.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2874.3095092773438,
+        "y": 5910.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "1fb07fdb.0d632",
+        "id": "ba46d15f.84fe98",
         "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": 2913.452392578125,
-        "y": 6014.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2920.3095092773438,
+        "y": 5976.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "a0d68506.3f9068",
+        "id": "ec7f1ff2.18d6b8",
         "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": 2957.452392578125,
-        "y": 6078.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2964.3095092773438,
+        "y": 6040.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "5459f399.0fb614",
+        "id": "9cb30ad2.947f6",
         "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": 2933.452392578125,
-        "y": 6132.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2940.3095092773438,
+        "y": 6094.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "29fd0e8b.8c7952",
+        "id": "78957203.1f8534",
         "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": 2879.452392578125,
-        "y": 6198.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2886.3095092773438,
+        "y": 6160.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "68fa786b.6c6688",
+        "id": "72d6e55e.c52994",
         "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": 2885.452392578125,
-        "y": 6254.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2892.3095092773438,
+        "y": 6216.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "caf48f2a.9458a",
+        "id": "f9bda76a.6618c8",
         "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": 2903.452392578125,
-        "y": 6310.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2910.3095092773438,
+        "y": 6272.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "15f23c59.7c19e4",
+        "id": "d4543380.8a8648",
         "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": 2483.452392578125,
-        "y": 6256.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2490.3095092773438,
+        "y": 6218.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "8525cf9e.edea6"
+                "ebf87fd3.da0e28"
             ]
         ]
     },
     {
-        "id": "e7c83d46.a2ef48",
+        "id": "80d478e2.ca4f3",
         "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": 2481.452392578125,
-        "y": 6310.0130615234375,
-        "z": "719b1fb6.3a5b9",
+        "x": 2488.3095092773438,
+        "y": 6272.584487915039,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "ef06dde5.e03b88"
+                "e0094cf6.191bc"
             ]
         ]
     },
     {
-        "id": "8525cf9e.edea6",
+        "id": "ebf87fd3.da0e28",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2717.452392578125,
-        "y": 6254.013061523437,
-        "z": "719b1fb6.3a5b9",
+        "x": 2724.3095092773438,
+        "y": 6216.584487915038,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "68fa786b.6c6688"
+                "72d6e55e.c52994"
             ]
         ]
     },
     {
-        "id": "ef06dde5.e03b88",
+        "id": "e0094cf6.191bc",
         "type": "success",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2711.452392578125,
-        "y": 6308.013061523437,
-        "z": "719b1fb6.3a5b9",
+        "x": 2718.3095092773438,
+        "y": 6270.584487915038,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "caf48f2a.9458a"
+                "f9bda76a.6618c8"
             ]
         ]
     },
     {
-        "id": "48f13d71.542c54",
+        "id": "c88ce4fa.2e3558",
         "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": 1252,
-        "y": 5412.000244140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1258.8571166992188,
+        "y": 5374.571670532227,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "5e336da6.0d601c"
+                "5a20be5b.b3a028"
             ]
         ]
     },
     {
-        "id": "5e336da6.0d601c",
+        "id": "5a20be5b.b3a028",
         "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": 1532,
-        "y": 5412.000244140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1538.8571166992188,
+        "y": 5374.571670532227,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "9ea4a345.b9cf7"
+                "deb0eb20.bf079"
             ]
         ]
     },
     {
-        "id": "9ea4a345.b9cf7",
+        "id": "deb0eb20.bf079",
         "type": "not-found",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1741.0001220703125,
-        "y": 5412.000244140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1747.8572387695312,
+        "y": 5374.571670532227,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "d4e4d3cb.8e365"
+                "80097c84.1bbc38"
             ]
         ]
     },
     {
-        "id": "6b713cfb.723974",
+        "id": "96d8122d.bb415",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 826.25,
-        "y": 1755,
-        "z": "719b1fb6.3a5b9",
+        "x": 833.1071166992188,
+        "y": 1717.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "80902f6b.f3783",
-                "84fcdd32.ae8a78",
-                "a887b563.1d77e"
+                "acaab3ca.702c88",
+                "6764646d.7a6754",
+                "e7afeea8.32592"
             ]
         ]
     },
     {
-        "id": "84fcdd32.ae8a78",
+        "id": "6764646d.7a6754",
         "type": "set",
         "name": "set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='' />",
+        "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": 1034,
-        "y": 1756,
-        "z": "719b1fb6.3a5b9",
+        "x": 1040.8571166992188,
+        "y": 1718.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "a887b563.1d77e",
+        "id": "e7afeea8.32592",
         "type": "switchNode",
         "name": "switch tmp.naming-data-payload is null",
         "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082,
-        "y": 2035,
-        "z": "719b1fb6.3a5b9",
+        "x": 1088.8571166992188,
+        "y": 1997.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "a826576f.08cdb8"
+                "b86e6a12.7ee33"
             ]
         ]
     },
     {
-        "id": "a826576f.08cdb8",
+        "id": "b86e6a12.7ee33",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1319,
-        "y": 2036,
-        "z": "719b1fb6.3a5b9",
+        "x": 1325.8571166992188,
+        "y": 1998.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "af5562cb.12735"
+                "6e3664a9.34079c"
             ]
         ]
     },
     {
-        "id": "af5562cb.12735",
+        "id": "6e3664a9.34079c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1357,
-        "y": 2094,
-        "z": "719b1fb6.3a5b9",
+        "x": 1363.8571166992188,
+        "y": 2056.5714263916016,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "6a94f7b6.2e3e3",
-                "27e20f71.6cc548",
-                "9ffd6dac.5925a",
-                "18ddf882.11fd17",
-                "a0734951.e43bb8",
-                "c0cd44d1.7422",
-                "9976393.8117548",
-                "36603013.bbb4f8"
+                "88f11c7a.f31688",
+                "fff738e5.4d0ce",
+                "f398ae72.bb9338",
+                "6d5e56ed.17d75",
+                "a0bc5db0.876ac8",
+                "a133146c.f8d1c",
+                "a6e4bc7d.20b678",
+                "93dc5615.04a418"
             ]
         ]
     },
     {
-        "id": "7f8df3af.553754",
+        "id": "bf89c636.30aac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1003,
-        "y": 5345,
-        "z": "719b1fb6.3a5b9",
+        "x": 1009.8571166992188,
+        "y": 5307.571426391602,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "9bc5841e.944e18",
-                "48f13d71.542c54",
-                "4e9878a6.bcb88"
+                "86e86da4.4fe67",
+                "c88ce4fa.2e3558",
+                "b36f7e94.174be"
             ]
         ]
     },
     {
-        "id": "9bc5841e.944e18",
+        "id": "86e86da4.4fe67",
         "type": "set",
         "name": "set set payload data",
-        "xml": "<set>\n<parameter name='tmp.naming-data-payload' value='' />",
+        "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": 1240,
-        "y": 5344,
-        "z": "719b1fb6.3a5b9",
+        "x": 1246.8571166992188,
+        "y": 5306.571426391602,
+        "z": "b88526e.24a7ad8",
         "wires": []
     },
     {
-        "id": "4e9878a6.bcb88",
+        "id": "b36f7e94.174be",
         "type": "switchNode",
         "name": "switch tmp.naming-data-payload is null",
         "xml": "<switch test=\"`$tmp.naming-data-payload == ''`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1282.2500305175781,
-        "y": 5534.5001220703125,
-        "z": "719b1fb6.3a5b9",
+        "x": 1289.1071472167969,
+        "y": 5497.071548461914,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "c1f0c66b.befbd"
+                "1f8cfbc.8ebb904"
             ]
         ]
     },
     {
-        "id": "c1f0c66b.befbd",
+        "id": "1f8cfbc.8ebb904",
         "type": "not-found",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1516.0000610351562,
-        "y": 5534.2498779296875,
-        "z": "719b1fb6.3a5b9",
+        "x": 1522.857177734375,
+        "y": 5496.821304321289,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "c6b57b94.c8c07"
+                "d5e5468.2a80438"
             ]
         ]
     },
     {
-        "id": "c6b57b94.c8c07",
+        "id": "d5e5468.2a80438",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1503.7500610351562,
-        "y": 5611.500244140625,
-        "z": "719b1fb6.3a5b9",
+        "x": 1510.607177734375,
+        "y": 5574.071670532227,
+        "z": "b88526e.24a7ad8",
         "wires": [
             [
-                "1fd7b0ea.d78def",
-                "b52f5f26.c98fb",
-                "382244f1.84c314",
-                "b1e358e4.0f1af8",
-                "8f868b5c.16e278",
-                "c761a7c.6b8ed58",
-                "4bd004e3.7dd99c",
-                "20e95425.2ec68c",
-                "64f6b871.04fb28"
+                "aba737c8.b673a",
+                "c54c6f8e.b8ff58",
+                "e94ef6dd.a37908",
+                "cbc78ec6.7ff248",
+                "d085846f.259da",
+                "af0954c0.0ed2a8",
+                "1e5d91b7.f1cac6",
+                "2d4ee971.9f5306",
+                "d6d7c682.438ef8"
             ]
         ]
+    },
+    {
+        "id": "2a352877.19cd9",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d6d7c682.438ef8",
+        "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",
+        "wires": [
+            [
+                "1ec3d3c3.85586c",
+                "80386656.f0d7d"
+            ]
+        ]
+    },
+    {
+        "id": "93dc5615.04a418",
+        "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",
+        "wires": [
+            [
+                "7136f5d4.61b024",
+                "ef775b29.4a7b"
+            ]
+        ]
+    },
+    {
+        "id": "99585b38.25a06",
+        "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",
+        "wires": [
+            [
+                "e6db3fc2.418c7",
+                "add1de2.24bbda"
+            ]
+        ]
+    },
+    {
+        "id": "f9afd12e.2d3128",
+        "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",
+        "wires": [
+            [
+                "8af1d548.36ba08",
+                "6b5d2c36.36d07c"
+            ]
+        ]
+    },
+    {
+        "id": "63a7432d.46f304",
+        "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",
+        "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 1d074f4..ba373a2 100644 (file)
--- 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
@@ -6,6 +6,10 @@
             <set>\r
                 <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\r
             </set>\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-capability-param-resolution' mode='sync' >\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
@@ -33,12 +37,16 @@
                                             <block atomic='true'>\r
                                                 <set>\r
                                                     <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />\r
+                                                    <parameter name='tmp.gen-name_length' value='1' />\r
                                                 </set>\r
                                                 <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`' >\r
                                                     <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'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                                 <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;,'`"/>\r
+                                                                <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`"/>\r
+                                                                <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`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -61,9 +69,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='DELETE' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -90,7 +103,7 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
@@ -136,7 +149,8 @@
                             <outcome value='true'>\r
                                 <block atomic='true'>\r
                                     <set>\r
-                                        <parameter name='tmp.naming-data-payload' value='' />\r
+                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\r
+                                        <parameter name='tmp.gen-name_length' value='0' />\r
                                     </set>\r
                                     <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
                                         <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`'>\r
@@ -148,10 +162,14 @@
                                                     <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`' >\r
                                                         <set>\r
                                                             <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;,'`"/>\r
+                                                            <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`"/>\r
+                                                            <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`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />\r
                                                         </set>\r
                                                     </for>\r
                                                     <set>\r
                                                         <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />\r
+                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />\r
                                                     </set>\r
                                                 </block>\r
                                             </outcome>\r
@@ -175,9 +193,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='POST' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -204,7 +227,7 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
@@ -276,12 +299,16 @@
                                             <block atomic='true'>\r
                                                 <set>\r
                                                     <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '{'`" />\r
+                                                    <parameter name='tmp.gen-name_length' value='1' />\r
                                                 </set>\r
                                                 <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`' >\r
                                                     <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'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                                 <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;,'`"/>\r
+                                                                <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`"/>\r
+                                                                <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`"/>\r
+                                                                <parameter name="`tmp.gen-name[0].element_length`" value='`$j + 1`' />\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -304,9 +331,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.UnAssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='DELETE' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -333,7 +365,7 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r
@@ -379,7 +411,8 @@
                             <outcome value='true'>\r
                                 <block atomic='true'>\r
                                     <set>\r
-                                        <parameter name='tmp.naming-data-payload' value='' />\r
+                                        <parameter name='tmp.naming-data-payload' value='{&quot;elements&quot;:[' />\r
+                                        <parameter name='tmp.gen-name_length' value='0' />\r
                                     </set>\r
                                     <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`' >\r
                                         <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`'>\r
@@ -391,10 +424,14 @@
                                                     <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`' >\r
                                                         <set>\r
                                                             <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;,'`"/>\r
+                                                            <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`"/>\r
+                                                            <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`"/>\r
+                                                            <parameter name="`tmp.gen-name[$tmp.gen-name_length].element_length`" value='`$j + 1`' />\r
                                                         </set>\r
                                                     </for>\r
                                                     <set>\r
                                                         <parameter name='tmp.naming-data-payload' value="`$tmp.naming-data-payload + '},'`" />\r
+                                                        <parameter name='tmp.gen-name_length' value='`$tmp.gen-name_length + 1`' />\r
                                                     </set>\r
                                                 </block>\r
                                             </outcome>\r
@@ -418,9 +455,14 @@
                                                     <parameter name='target' value=',]' />\r
                                                     <parameter name='replacement' value=']' />\r
                                                 </execute>\r
-                                                <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>\r
-                                                    <parameter name='payload' value='`$tmp.naming-data-payload`' />\r
-                                                    <parameter name="prifix" value="nameGenResponse" />\r
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.naming.gen-name.templatefile`" />\r
+                                                    <parameter name='restapiUrl' value='`$prop.naming.gen-name.url + $prop.restapi.naming.gen-name.service`' />\r
+                                                    <parameter name='restapiUser' value='`$prop.naming.gen-name.user`' />\r
+                                                    <parameter name='restapiPassword' value='`$prop.naming.gen-name.pwd`' />\r
+                                                    <parameter name='format' value='json' />\r
+                                                    <parameter name='httpMethod' value='POST' />\r
+                                                    <parameter name="responsePrefix" value="nameGenResponse" />\r
                                                     <outcome value='failure'>\r
                                                         <block>\r
                                                             <set>\r
@@ -447,7 +489,7 @@
                                                     </outcome>\r
                                                 </execute>\r
                                                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                                                    <parameter name="source" value="nameGenResponse.response-payload" />\r
+                                                    <parameter name="source" value="nameGenResponse.httpResponse" />\r
                                                     <parameter name="outputPath" value="jsonContextPrefix" />\r
                                                     <parameter name="isEscaped" value="false" />\r
                                                 </execute>\r

diff --git a/platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json b/platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json
new file mode 100644 (file)
index 0000000..1887aed
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/naming-ms-post-gen-name.json
@@ -0,0 +1,13 @@
+{
+     "elements": [
+   ${repeat:tmp.gen-name_length:
+         {
+            ${repeat:tmp.gen-name[${1}].element_length:
+                        ${tmp.gen-name[${1}].element[${2}].name}: ${tmp.gen-name[${1}].element[${2}].value}
+                ,
+         },
+   },
+        }
+
+     ]
+ }
\ No newline at end of file