Revert "GRAPI DG enhancement"

This reverts commit 48c912df5cc69f58592d96a93e8b72900587dc89 [formerly 8d5a350ab0128e46a81042341f2024a88631d35a]. This change breaks the flow in a few ways: - loses fix to case where now GW preload is found. - depends on an adaptor that is not part of ONAP (MSOAdaptor) - uses a rest api template that does not exist. Change-Id: I7db150174484309e2ec3b49365403ca0d4f7ac6f Issue-ID: SDNC-870 Issue-ID: SDNC-871 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Former-commit-id: ffce554d009b58c71e433d9edc3ba6476f4ce9ce
author: Timoney, Dan (dt5972) <dtimoney@att.com> 2019-08-27 09:53:59 -0400
committer: Timoney, Dan (dt5972) <dtimoney@att.com> 2019-08-27 09:54:57 -0400
commit: 8e136272ffd5555c66ac4b8b6310eb974ca86e19 (patch)
tree: d1568a4af32ee767b06371c6aad1dab55906ccd1 /platform-logic/generic-resource-api
parent: c69e8ece5071de0ab4d029f64303a2591e8bb1ed (diff)
21 files changed, 5641 insertions, 15729 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
index e9f6907d..5dcd7e88 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
@@ -1,1314 +1 @@
-[
-    {
-        "id": "ac4672ac.5506d",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 188.5863037109375,
-        "y": 82.87202453613281,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "317db8fd.6a2138"
-            ]
-        ]
-    },
-    {
-        "id": "5ad093b4.b05f9c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 211.77679443359375,
-        "y": 197.72124099731445,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "1da7f042.70418",
-                "cd953152.81acb",
-                "96a7ad27.1cb38",
-                "78d86895.250bc8",
-                "7d46526.17c5aac",
-                "beeecd6c.915e8",
-                "cdf4ff1.5e539",
-                "d2d53277.c8e3b",
-                "4d9da943.9b5318",
-                "74e369b1.130768"
-            ]
-        ]
-    },
-    {
-        "id": "f1172be.64de4d8",
-        "type": "method",
-        "name": "method self-serve-vf-module-assign",
-        "xml": "<method rpc='self-serve-vf-module-assign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 292.3482131958008,
-        "y": 137.57837963104248,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "5ad093b4.b05f9c"
-            ]
-        ]
-    },
-    {
-        "id": "317db8fd.6a2138",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 450.82450103759766,
-        "y": 83.0625171661377,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "f1172be.64de4d8"
-            ]
-        ]
-    },
-    {
-        "id": "cd953152.81acb",
-        "type": "switchNode",
-        "name": "switch vf-module-parameters.param_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 526.8363342285156,
-        "y": 1400.2411880493164,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "1cade304.1c3bbd"
-            ]
-        ]
-    },
-    {
-        "id": "1cade304.1c3bbd",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 786.8363647460938,
-        "y": 1400.2411880493164,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "da6ecb81.86ff58"
-            ]
-        ]
-    },
-    {
-        "id": "55d6d80f.981a78",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:self-serve-vfmodule-ra-assignment",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vfmodule-ra-assignment' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1328.5506134033203,
-        "y": 1447.5269384384155,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "b1e02e63.0273f"
-            ]
-        ]
-    },
-    {
-        "id": "bd16b308.30dcd",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n",
-        "comments": "",
-        "x": 1809.2648544311523,
-        "y": 1447.0983419418335,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "f6c740a2.a923e",
-        "type": "for",
-        "name": "foreach vf-module-parameters.param[]",
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 812.1222991943359,
-        "y": 1710.4197750091553,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "7eddc009.26c91",
-                "d8e56ff1.4693a"
-            ]
-        ]
-    },
-    {
-        "id": "1da7f042.70418",
-        "type": "set",
-        "name": "set ss.capability.execution-order[]",
-        "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
-        "comments": "",
-        "x": 499.00296783447266,
-        "y": 1262.3006677627563,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "96a7ad27.1cb38",
-        "type": "for",
-        "name": "foreach capability-order[]",
-        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 467.7649230957031,
-        "y": 1566.2410678863525,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "7e687860.5de498",
-                "baaad7ca.98ffc8",
-                "f6c740a2.a923e",
-                "dc8699f7.88cd38"
-            ]
-        ]
-    },
-    {
-        "id": "7eddc009.26c91",
-        "type": "switchNode",
-        "name": "switch capability-name param vs. execution",
-        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1178.515121459961,
-        "y": 1756.0625677108765,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "24ac9f8a.76969"
-            ]
-        ]
-    },
-    {
-        "id": "24ac9f8a.76969",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1442.015121459961,
-        "y": 1756.3125677108765,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "2b650c7a.d8a5d4"
-            ]
-        ]
-    },
-    {
-        "id": "b1e02e63.0273f",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1655.1219596862793,
-        "y": 1446.9555320739746,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "bd16b308.30dcd"
-            ]
-        ]
-    },
-    {
-        "id": "7e687860.5de498",
-        "type": "set",
-        "name": "set ss.capability-name",
-        "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order\n-->",
-        "comments": "",
-        "x": 759.1219787597656,
-        "y": 1566.1935195922852,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "d8e56ff1.4693a",
-        "type": "set",
-        "name": "tmp.param.capability-name",
-        "xml": "<set>\n<parameter name='tmp.param.capability-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n",
-        "comments": "",
-        "x": 1127.8721466064453,
-        "y": 1710.6697778701782,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "baaad7ca.98ffc8",
-        "type": "set",
-        "name": "set ss.capability-action = assign",
-        "xml": "<set>\n<parameter name='ss.capability-action' value='assign' />\n",
-        "comments": "",
-        "x": 789.8361206054688,
-        "y": 1613.1101036071777,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "dc8699f7.88cd38",
-        "type": "set",
-        "name": "set capability-dg with 'self-serve-' + capability-name",
-        "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
-        "comments": "",
-        "x": 852.1695861816406,
-        "y": 1661.7649745941162,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "27bec64f.ffd41a",
-        "type": "set",
-        "name": "set sdnc-generated-cloud-resources = true",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.sdnc-generated-cloud-resources' \n\tvalue='true' />\n",
-        "comments": "",
-        "x": 1114.5386962890625,
-        "y": 1148.7293434143066,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "f04ab0bc.e42dc",
-        "type": "switchNode",
-        "name": "switch resource-resolution-data.status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 893.0984791346959,
-        "y": 2241.511119570051,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "c5e63e10.a3093",
-                "1f165162.67ec4f"
-            ]
-        ]
-    },
-    {
-        "id": "c5e63e10.a3093",
-        "type": "other",
-        "name": "PENDING",
-        "xml": "<outcome value='PENDING'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1162.455695016044,
-        "y": 2241.5110757010325,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "61a1d33.b88882c"
-            ]
-        ]
-    },
-    {
-        "id": "1f165162.67ec4f",
-        "type": "other",
-        "name": "FAILED",
-        "xml": "<outcome value='FAILED'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1155.991511208671,
-        "y": 2292.4754063742503,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "61a1d33.b88882c"
-            ]
-        ]
-    },
-    {
-        "id": "61a1d33.b88882c",
-        "type": "call",
-        "name": "call ss.capability-dg",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1371.1102436610636,
-        "y": 2293.2372576849802,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "e5879237.9e628",
-                "2526c489.eb217c"
-            ]
-        ]
-    },
-    {
-        "id": "e5879237.9e628",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1564.1455944606241,
-        "y": 2292.9515359061106,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "d2b0c64f.697d78"
-            ]
-        ]
-    },
-    {
-        "id": "beeecd6c.915e8",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vf-assign.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 413.2013931274414,
-        "y": 2755.56672000885,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "78d86895.250bc8",
-        "type": "switchNode",
-        "name": "switch vf-module_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 464.7885932922363,
-        "y": 317.1340227127075,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "94c0784a.4efbd8",
-                "2302720.f948a8e",
-                "4dc65b88.c7c4c4"
-            ]
-        ]
-    },
-    {
-        "id": "94c0784a.4efbd8",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 677.419563293457,
-        "y": 246.52681350708008,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "c1ab19e3.a09b38"
-            ]
-        ]
-    },
-    {
-        "id": "c98eda13.6cb768",
-        "type": "set",
-        "name": "set vf-module-index=0",
-        "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",
-        "comments": "",
-        "x": 1016.5385932922363,
-        "y": 257.4435987472534,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "2302720.f948a8e",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 676.5981559753418,
-        "y": 385.3126735687256,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "e441c1f2.c0ad1"
-            ]
-        ]
-    },
-    {
-        "id": "f5150a81.100538",
-        "type": "set",
-        "name": "set vf-module-id",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'\n   value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n",
-        "comments": "",
-        "x": 1032.824234008789,
-        "y": 539.5536422729492,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "fe3a9a0d.f3a558",
-        "type": "set",
-        "name": "set vf-module-parameters",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.'\n  value='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.' />\n",
-        "comments": "",
-        "x": 1197.5148315429688,
-        "y": 1399.3964304924011,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "3c0e578a.5d7b08",
-        "type": "set",
-        "name": "set order-status to PendingCreate",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.request-information.request-action`' />",
-        "comments": "",
-        "x": 1087.098403930664,
-        "y": 1101.416841506958,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "7d46526.17c5aac",
-        "type": "set",
-        "name": "set ss.capability-type = vf-module",
-        "xml": "<set>\n<parameter name='ss.capability-type' value='vf-module' />\n",
-        "comments": "",
-        "x": 499.9077606201172,
-        "y": 1219.3006258010864,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "da6ecb81.86ff58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 962.1934574672159,
-        "y": 1400.1220000130788,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "fe3a9a0d.f3a558",
-                "55d6d80f.981a78",
-                "dfb33174.f2c9c"
-            ]
-        ]
-    },
-    {
-        "id": "cdf4ff1.5e539",
-        "type": "set",
-        "name": "set is-new-vfmodule = true",
-        "xml": "<set>\n<parameter name='is-new-vfmodule' value='true' />\n",
-        "comments": "",
-        "x": 471.6102752685547,
-        "y": 197.55074501037598,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "f6595347.aba9",
-        "type": "for",
-        "name": "for each existing VF module",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1035.4315338134766,
-        "y": 385.0030117034912,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "cb80b6c2.f7f7a8"
-            ]
-        ]
-    },
-    {
-        "id": "cb80b6c2.f7f7a8",
-        "type": "switchNode",
-        "name": "switch vf-module-id: input vs service-data",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1346.550666809082,
-        "y": 385.574426651001,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "cb23fa3d.38db08"
-            ]
-        ]
-    },
-    {
-        "id": "cb23fa3d.38db08",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1600.4196968078613,
-        "y": 385.39588356018066,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "25cbd14.1ae082e"
-            ]
-        ]
-    },
-    {
-        "id": "5f9f2341.7aeedc",
-        "type": "set",
-        "name": "set is-new-vfmodule = false",
-        "xml": "<set>\n<parameter name='is-new-vfmodule' value='false' />\n",
-        "comments": "",
-        "x": 1972.5864372253418,
-        "y": 384.657772064209,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "25cbd14.1ae082e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1741.836441040039,
-        "y": 384.9077682495117,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "5f9f2341.7aeedc",
-                "b086c015.9686a",
-                "539e0d93.0e4764"
-            ]
-        ]
-    },
-    {
-        "id": "b086c015.9686a",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 1909.7292289733887,
-        "y": 470.90774631500244,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "539e0d93.0e4764",
-        "type": "set",
-        "name": "set vf-module-index = idx",
-        "xml": "<set>\n<parameter name='vf-module-index' value='`$idx`' />\n",
-        "comments": "",
-        "x": 1965.5507507324219,
-        "y": 427.94342708587646,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "470bd393.8815fc",
-        "type": "set",
-        "name": "set new vf-module_length = vf-module-index + 1",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n",
-        "comments": "",
-        "x": 1097.8960151672363,
-        "y": 298.7650270462036,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "e441c1f2.c0ad1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 813.7530708312988,
-        "y": 385.69353580474854,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "9c5458e2.63ba88",
-                "f6595347.aba9"
-            ]
-        ]
-    },
-    {
-        "id": "f2ad673d.c9d758",
-        "type": "set",
-        "name": "set new vf-module_length++",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length + 1`' />\n",
-        "comments": "",
-        "x": 1583.0030937194824,
-        "y": 497.4435405731201,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "9c5458e2.63ba88",
-        "type": "switchNode",
-        "name": "switch is-new-vfmodule",
-        "xml": "<switch test='`$is-new-vfmodule`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1021.2530670166016,
-        "y": 455.2649154663086,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "328de05d.d7c21"
-            ]
-        ]
-    },
-    {
-        "id": "328de05d.d7c21",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1219.110221862793,
-        "y": 454.8363628387451,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "b1cc1eae.576a8"
-            ]
-        ]
-    },
-    {
-        "id": "c1ab19e3.a09b38",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 820.2530670166016,
-        "y": 278.19353008270264,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "470bd393.8815fc",
-                "c98eda13.6cb768"
-            ]
-        ]
-    },
-    {
-        "id": "4dc65b88.c7c4c4",
-        "type": "other",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 678.5863037109375,
-        "y": 316.6220245361328,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "c1ab19e3.a09b38"
-            ]
-        ]
-    },
-    {
-        "id": "d2d53277.c8e3b",
-        "type": "switchNode",
-        "name": "switch is-new-vfmodule",
-        "xml": "<switch test='`$is-new-vfmodule`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 464.3363037109375,
-        "y": 540.3720245361328,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "228816c9.7d6b7a"
-            ]
-        ]
-    },
-    {
-        "id": "228816c9.7d6b7a",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 662.1934585571289,
-        "y": 539.9434719085693,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "160cf147.59b4af"
-            ]
-        ]
-    },
-    {
-        "id": "9660a91.81f1358",
-        "type": "set",
-        "name": "Copy vf-module-topology data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-name' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-type' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.tenant' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-cloud-region' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli'\n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-clli`' />",
-        "comments": "",
-        "x": 1078.0863189697266,
-        "y": 585.3720941543579,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "d0c524cc.997e98",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n",
-        "comments": "",
-        "x": 1443.0980796813965,
-        "y": 637.8155345916748,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "9632b3a5.151f7",
-        "type": "switchNode",
-        "name": "switch input model-invariant-uuid",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1086.9551544189453,
-        "y": 660.6399784088135,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "d993041d.727fe8",
-                "7b777471.7e5a6c"
-            ]
-        ]
-    },
-    {
-        "id": "d993041d.727fe8",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1292.621826171875,
-        "y": 637.7829418182373,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "d0c524cc.997e98"
-            ]
-        ]
-    },
-    {
-        "id": "7b777471.7e5a6c",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1294.050422668457,
-        "y": 682.0685329437256,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "23246502.21d58a"
-            ]
-        ]
-    },
-    {
-        "id": "23246502.21d58a",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n",
-        "comments": "",
-        "x": 1448.3361587524414,
-        "y": 681.4971051216125,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "9b1fd622.5ea208",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n",
-        "comments": "",
-        "x": 1444.050350189209,
-        "y": 726.3542108535767,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "a9b9767.d0f3d88",
-        "type": "switchNode",
-        "name": "switch input model-uuid",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1059.5741729736328,
-        "y": 749.1787157058716,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "95b67445.582658",
-                "f28422f1.a8a5a"
-            ]
-        ]
-    },
-    {
-        "id": "95b67445.582658",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1293.574146270752,
-        "y": 726.321647644043,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "9b1fd622.5ea208"
-            ]
-        ]
-    },
-    {
-        "id": "f28422f1.a8a5a",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1295.002742767334,
-        "y": 770.6072387695312,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "5b080c13.af5d04"
-            ]
-        ]
-    },
-    {
-        "id": "5b080c13.af5d04",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n",
-        "comments": "",
-        "x": 1449.2884788513184,
-        "y": 770.0358109474182,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "3e2787e5.70ce38",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n",
-        "comments": "",
-        "x": 1435.1932830810547,
-        "y": 815.2114181518555,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "d072296.6aca9d8",
-        "type": "switchNode",
-        "name": "switch input model-version",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1061.7170448303223,
-        "y": 838.0358629226685,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "ae7bcfb3.5f0d2",
-                "153e40d6.cb774f"
-            ]
-        ]
-    },
-    {
-        "id": "ae7bcfb3.5f0d2",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1284.7170295715332,
-        "y": 815.178825378418,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "3e2787e5.70ce38"
-            ]
-        ]
-    },
-    {
-        "id": "153e40d6.cb774f",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1286.1456260681152,
-        "y": 859.4644165039062,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "ab4b217e.693c2"
-            ]
-        ]
-    },
-    {
-        "id": "ab4b217e.693c2",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-version'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n",
-        "comments": "",
-        "x": 1440.4313621520996,
-        "y": 858.8929886817932,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "59cb1887.519c68",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n",
-        "comments": "",
-        "x": 1435.1932830810547,
-        "y": 902.3542404174805,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "e085243.3e05cd8",
-        "type": "switchNode",
-        "name": "switch input model-name",
-        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1058.7170448303223,
-        "y": 925.1786851882935,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "4f31d90c.74c998",
-                "84e2607f.f6a01"
-            ]
-        ]
-    },
-    {
-        "id": "4f31d90c.74c998",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1284.7170295715332,
-        "y": 902.321647644043,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "59cb1887.519c68"
-            ]
-        ]
-    },
-    {
-        "id": "84e2607f.f6a01",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1286.1456260681152,
-        "y": 946.6072387695312,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "6e518b97.0cd334"
-            ]
-        ]
-    },
-    {
-        "id": "6e518b97.0cd334",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-name'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`' />\n",
-        "comments": "",
-        "x": 1440.4313621520996,
-        "y": 946.0358109474182,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "ec7b65fb.fc6018",
-        "type": "set",
-        "name": "set model-customization-uuid",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-customization-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n",
-        "comments": "",
-        "x": 1072.1694030761719,
-        "y": 999.1161699295044,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "63af0c3d.77f934",
-        "type": "set",
-        "name": "copy input data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.' \n    value='$vf-module-topology-operation-input.vf-module-request-input.' />",
-        "comments": "",
-        "x": 1028.824478149414,
-        "y": 1053.8008728027344,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "160cf147.59b4af",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 818.2887191772461,
-        "y": 539.7212162017822,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "9632b3a5.151f7",
-                "a9b9767.d0f3d88",
-                "d072296.6aca9d8",
-                "e085243.3e05cd8",
-                "ec7b65fb.fc6018",
-                "63af0c3d.77f934",
-                "9660a91.81f1358",
-                "f5150a81.100538",
-                "3c0e578a.5d7b08",
-                "27bec64f.ffd41a"
-            ]
-        ]
-    },
-    {
-        "id": "dd621f57.8792a",
-        "type": "set",
-        "name": "set vf-module-index = vf-module_length",
-        "xml": "<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",
-        "comments": "",
-        "x": 1615.5863227844238,
-        "y": 453.62203216552734,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "b1cc1eae.576a8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1362.0863227844238,
-        "y": 454.37203216552734,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "dd621f57.8792a",
-                "f2ad673d.c9d758"
-            ]
-        ]
-    },
-    {
-        "id": "2b650c7a.d8a5d4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 618.0148696899414,
-        "y": 2241.538803100586,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "f04ab0bc.e42dc",
-                "9691a52d.6666b8"
-            ]
-        ]
-    },
-    {
-        "id": "9691a52d.6666b8",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 796.4434356689453,
-        "y": 2510.9673385620117,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "2526c489.eb217c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1588.4076690673828,
-        "y": 2438.943384170532,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "3c2b90e5.13698"
-            ]
-        ]
-    },
-    {
-        "id": "3c2b90e5.13698",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"`'DONE: ' + $ss.capability-dg`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1732.1576690673828,
-        "y": 2437.693384170532,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dfb33174.f2c9c",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE with vfmodule-ra-assignment\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1142.3363037109375,
-        "y": 1495.3720245361328,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8f918c25.18662",
-        "type": "execute",
-        "name": "execute PropertiesNode",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 890.5863167898997,
-        "y": 1308.5862832750595,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4d9da943.9b5318",
-        "type": "switchNode",
-        "name": "switch prop.controller.user",
-        "xml": "<switch test='`$prop.controller.user`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 479.30055236816406,
-        "y": 1309.0149040222168,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "7e82a787.ebfeb8"
-            ]
-        ]
-    },
-    {
-        "id": "7e82a787.ebfeb8",
-        "type": "failure",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 679.1576478140696,
-        "y": 1308.5863185610092,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "8f918c25.18662"
-            ]
-        ]
-    },
-    {
-        "id": "74e369b1.130768",
-        "type": "call",
-        "name": "call self-serve-vf-module-mdsal-put",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 496.5741882324219,
-        "y": 2650.58260345459,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "72e787c4.788818",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 1958.5863037109375,
-        "y": 2376.507080078125,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    },
-    {
-        "id": "d2b0c64f.697d78",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1734.0270718165812,
-        "y": 2292.0185897009715,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            [
-                "72e787c4.788818",
-                "245c83ad.8fed6c",
-                "c9140ce7.8a308"
-            ]
-        ]
-    },
-    {
-        "id": "245c83ad.8fed6c",
-        "type": "call",
-        "name": "call self-serve-vf-module-mdsal-put",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2033.2294006347656,
-        "y": 2334.0579681396484,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c9140ce7.8a308",
-        "type": "set",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name='error-message' value=\"`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`\" />",
-        "comments": "",
-        "x": 1971.4439086914062,
-        "y": 2291.5579509735107,
-        "z": "6a89d3e3.fb4ddc",
-        "wires": []
-    }
-]
-\ No newline at end of file
+[{"id":"6868b8a8.dbf5a8","type":"dgstart","name":"DGSTART","outputs":1,"x":112.85714721679688,"y":47.14285659790039,"z":"91b54cc.abe6fb","wires":[["7a4d3ba3.61bc54"]]},{"id":"926ca261.62938","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":136.04763793945312,"y":161.99207305908203,"z":"91b54cc.abe6fb","wires":[["7653f459.a9c4ac","64f19720.d90278","7cbb6ca3.ac8b74","a1d640d8.5970b","50070dff.5a6824","2c716907.879226","99b30318.a25b8","f6ea2e74.036bf","334378e9.992958"]]},{"id":"a0448fa2.008b4","type":"method","name":"method self-serve-vf-module-assign","xml":"<method rpc='self-serve-vf-module-assign' mode='sync'>\n","comments":"","outputs":1,"x":216.61905670166016,"y":101.84921169281006,"z":"91b54cc.abe6fb","wires":[["926ca261.62938"]]},{"id":"7a4d3ba3.61bc54","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":375.09534454345703,"y":47.33334922790527,"z":"91b54cc.abe6fb","wires":[["a0448fa2.008b4"]]},{"id":"64f19720.d90278","type":"switchNode","name":"switch vf-module-parameters.param_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>\n","comments":"","outputs":1,"x":451.107177734375,"y":1364.512020111084,"z":"91b54cc.abe6fb","wires":[["85b4cef0.b1825"]]},{"id":"85b4cef0.b1825","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":711.1072082519531,"y":1364.512020111084,"z":"91b54cc.abe6fb","wires":[["748e831a.d0c23c"]]},{"id":"1d58f607.87766a","type":"call","name":"call GENERIC-RESOURCE-API:self-serve-vfmodule-ra-assignment","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-vfmodule-ra-assignment' mode='sync' >\n","comments":"","outputs":1,"x":1252.8214569091797,"y":1411.797770500183,"z":"91b54cc.abe6fb","wires":[["26ee1e68.97de82"]]},{"id":"56f2b98b.164b28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n","comments":"","x":1733.5356979370117,"y":1411.369174003601,"z":"91b54cc.abe6fb","wires":[]},{"id":"aba85aab.9a0a08","type":"for","name":"foreach vf-module-parameters.param[]","xml":"<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n","comments":"","outputs":1,"x":736.3931427001953,"y":1674.6906070709229,"z":"91b54cc.abe6fb","wires":[["c9efa47e.335348","8aa3fdb3.22f8c"]]},{"id":"7653f459.a9c4ac","type":"set","name":"set ss.capability.execution-order[]","xml":"<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n","comments":"","x":423.27381134033203,"y":1226.571499824524,"z":"91b54cc.abe6fb","wires":[]},{"id":"7cbb6ca3.ac8b74","type":"for","name":"foreach capability-order[]","xml":"<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n","comments":"","outputs":1,"x":392.0357666015625,"y":1530.5118999481201,"z":"91b54cc.abe6fb","wires":[["92dcc6b8.e62178","f9d0cff9.6c71b","aba85aab.9a0a08","e3f5351e.f5ae18"]]},{"id":"c9efa47e.335348","type":"switchNode","name":"switch capability-name param vs. execution","xml":"<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n","comments":"","outputs":1,"x":1102.7859649658203,"y":1720.333399772644,"z":"91b54cc.abe6fb","wires":[["f81a6799.d54bc8"]]},{"id":"f81a6799.d54bc8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1366.2859649658203,"y":1720.583399772644,"z":"91b54cc.abe6fb","wires":[["ea51742f.770a78"]]},{"id":"26ee1e68.97de82","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1579.3928031921387,"y":1411.2263641357422,"z":"91b54cc.abe6fb","wires":[["56f2b98b.164b28"]]},{"id":"92dcc6b8.e62178","type":"set","name":"set ss.capability-name","xml":"<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order\n-->","comments":"","x":683.392822265625,"y":1530.4643516540527,"z":"91b54cc.abe6fb","wires":[]},{"id":"8aa3fdb3.22f8c","type":"set","name":"tmp.param.capability-name","xml":"<set>\n<parameter name='tmp.param.capability-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n","comments":"","x":1052.1429901123047,"y":1674.9406099319458,"z":"91b54cc.abe6fb","wires":[]},{"id":"f9d0cff9.6c71b","type":"set","name":"set ss.capability-action = assign","xml":"<set>\n<parameter name='ss.capability-action' value='assign' />\n","comments":"","x":714.1069641113281,"y":1577.3809356689453,"z":"91b54cc.abe6fb","wires":[]},{"id":"e3f5351e.f5ae18","type":"set","name":"set capability-dg with 'self-serve-' + capability-name","xml":"<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n","comments":"","x":776.4404296875,"y":1626.0358066558838,"z":"91b54cc.abe6fb","wires":[]},{"id":"fd294fda.d3f2","type":"set","name":"set sdnc-generated-cloud-resources = true","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.sdnc-generated-cloud-resources' \n\tvalue='true' />\n","comments":"","x":1038.8095397949219,"y":1113.0001754760742,"z":"91b54cc.abe6fb","wires":[]},{"id":"5c76fc7c.9945a4","type":"switchNode","name":"switch resource-resolution-data.status","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\n","comments":"","outputs":1,"x":817.3693226405553,"y":2205.7819516318186,"z":"91b54cc.abe6fb","wires":[["962297ef.1b4ae8","50d68e38.aaa05"]]},{"id":"962297ef.1b4ae8","type":"other","name":"PENDING","xml":"<outcome value='PENDING'>\n","comments":"","outputs":1,"x":1086.726538521903,"y":2205.7819077628,"z":"91b54cc.abe6fb","wires":[["de4d28cd.f1c0b8"]]},{"id":"50d68e38.aaa05","type":"other","name":"FAILED","xml":"<outcome value='FAILED'>\n","comments":"","outputs":1,"x":1080.26235471453,"y":2256.746238436018,"z":"91b54cc.abe6fb","wires":[["de4d28cd.f1c0b8"]]},{"id":"de4d28cd.f1c0b8","type":"call","name":"call ss.capability-dg","xml":"<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n","comments":"","outputs":1,"x":1295.3810871669225,"y":2257.508089746748,"z":"91b54cc.abe6fb","wires":[["aa328105.5a90d","b94864ab.41a158"]]},{"id":"99d1906.3546f7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`\" />\n","comments":"","x":1870.0714214869913,"y":2611.1989409582957,"z":"91b54cc.abe6fb","wires":[]},{"id":"aa328105.5a90d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1488.416437966483,"y":2257.222367967878,"z":"91b54cc.abe6fb","wires":[["5785c779.43b468"]]},{"id":"5785c779.43b468","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1651.6905544825963,"y":2256.5319087164744,"z":"91b54cc.abe6fb","wires":[["99d1906.3546f7","7c7199e0.e4fc38","33e435e5.b94ada","148b6290.868b6d","2648587b.758f38","7217dcc6.1f9534"]]},{"id":"7c7199e0.e4fc38","type":"execute","name":"execute RestApiCallNode - PUT vf-module","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vfmodule\" />\n\n","comments":"","outputs":1,"x":1967.237994057792,"y":2512.905868257795,"z":"91b54cc.abe6fb","wires":[["58f9a59e.4560fc","7332862.47c3578"]]},{"id":"58f9a59e.4560fc","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2241.8316601344522,"y":2566.9040219443186,"z":"91b54cc.abe6fb","wires":[["85773de1.18cd6"]]},{"id":"7332862.47c3578","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2234.260294778007,"y":2513.4040419714793,"z":"91b54cc.abe6fb","wires":[["85773de1.18cd6"]]},{"id":"2c716907.879226","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vf-assign.log' />\n","comments":"","outputs":1,"x":334.6150894165039,"y":2801.2663040161133,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"a1d640d8.5970b","type":"switchNode","name":"switch vf-module_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n","comments":"","outputs":1,"x":389.0594367980957,"y":281.4048547744751,"z":"91b54cc.abe6fb","wires":[["a95fd413.5e0e28","5795ddc4.7c3484","43cfb62f.bd11e8"]]},{"id":"a95fd413.5e0e28","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":601.6904067993164,"y":210.79764556884766,"z":"91b54cc.abe6fb","wires":[["9216bdc4.04dbd"]]},{"id":"d2eaae5b.c69a6","type":"set","name":"set vf-module-index=0","xml":"<set>\n<parameter name='vf-module-index' value='0' />\n","comments":"","x":940.8094367980957,"y":221.714430809021,"z":"91b54cc.abe6fb","wires":[]},{"id":"5795ddc4.7c3484","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":600.8689994812012,"y":349.58350563049316,"z":"91b54cc.abe6fb","wires":[["3a293e2a.3382a2"]]},{"id":"ff927cfe.36078","type":"set","name":"set vf-module-id","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'\n   value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n","comments":"","x":957.0950775146484,"y":503.8244743347168,"z":"91b54cc.abe6fb","wires":[]},{"id":"f3a77d62.1d1e9","type":"set","name":"set vf-module-parameters","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.'\n  value='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.' />\n","comments":"","x":1121.7856750488281,"y":1363.6672625541687,"z":"91b54cc.abe6fb","wires":[]},{"id":"595cc53d.0afe7c","type":"set","name":"set order-status to PendingCreate","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.request-information.request-action`' />","comments":"","x":1011.3692474365234,"y":1065.6876735687256,"z":"91b54cc.abe6fb","wires":[]},{"id":"33e435e5.b94ada","type":"set","name":"set vf data for restapi-call-node","xml":"<set>\n<parameter name='vf.vf-module-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\n<parameter name='vf.vf-module-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\n<parameter name='vf.vf-module-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\n<parameter name='vf.vf-module-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\n<parameter name='vf.vf-module-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\n<parameter name='vf.vf-module-data.vf-module-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\n<parameter name='vf.vf-module-data.vf-module-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\n<parameter name='vf.vf-module-data.vf-module-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />","comments":"","x":1928.7500179835733,"y":2257.0238854544505,"z":"91b54cc.abe6fb","wires":[]},{"id":"148b6290.868b6d","type":"execute","name":"generate ss-vfmodule url replace service-instance-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vfmodule-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`\"/>\n","comments":"","outputs":1,"x":1994.9999645778116,"y":2305.0239302771433,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"2648587b.758f38","type":"execute","name":"generate ss-vfmodule url - replace vnf-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`\"/>\n","comments":"","outputs":1,"x":1959.2856625148233,"y":2353.0828473227366,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"7217dcc6.1f9534","type":"execute","name":"generate ss-vfmodule url - replace vf-module-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\"/>\n","comments":"","outputs":1,"x":1981.2263363429483,"y":2402.9993474142893,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"50070dff.5a6824","type":"set","name":"set ss.capability-type = vf-module","xml":"<set>\n<parameter name='ss.capability-type' value='vf-module' />\n","comments":"","x":424.17860412597656,"y":1183.571457862854,"z":"91b54cc.abe6fb","wires":[]},{"id":"748e831a.d0c23c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":886.4643009730748,"y":1364.3928320748464,"z":"91b54cc.abe6fb","wires":[["f3a77d62.1d1e9","1d58f607.87766a","43c3be4e.88c54"]]},{"id":"99b30318.a25b8","type":"set","name":"set is-new-vfmodule = true","xml":"<set>\n<parameter name='is-new-vfmodule' value='true' />\n","comments":"","x":395.88111877441406,"y":161.82157707214355,"z":"91b54cc.abe6fb","wires":[]},{"id":"9b4dabbd.473368","type":"for","name":"for each existing VF module","xml":"<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n","comments":"","outputs":1,"x":959.7023773193359,"y":349.2738437652588,"z":"91b54cc.abe6fb","wires":[["49c1e178.08199"]]},{"id":"49c1e178.08199","type":"switchNode","name":"switch vf-module-id: input vs service-data","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>\n","comments":"","outputs":1,"x":1270.8215103149414,"y":349.84525871276855,"z":"91b54cc.abe6fb","wires":[["757c4d39.7a2634"]]},{"id":"757c4d39.7a2634","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1524.6905403137207,"y":349.66671562194824,"z":"91b54cc.abe6fb","wires":[["46d944ca.051e3c"]]},{"id":"621bd7bb.066da8","type":"set","name":"set is-new-vfmodule = false","xml":"<set>\n<parameter name='is-new-vfmodule' value='false' />\n","comments":"","x":1896.8572807312012,"y":348.92860412597656,"z":"91b54cc.abe6fb","wires":[]},{"id":"46d944ca.051e3c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1666.1072845458984,"y":349.1786003112793,"z":"91b54cc.abe6fb","wires":[["621bd7bb.066da8","462be844.06c458","174805e6.ef092a"]]},{"id":"462be844.06c458","type":"break","name":"break","xml":"<break>\n","comments":"","x":1834.000072479248,"y":435.17857837677,"z":"91b54cc.abe6fb","wires":[]},{"id":"174805e6.ef092a","type":"set","name":"set vf-module-index = idx","xml":"<set>\n<parameter name='vf-module-index' value='`$idx`' />\n","comments":"","x":1889.8215942382812,"y":392.21425914764404,"z":"91b54cc.abe6fb","wires":[]},{"id":"2aa88539.254a4a","type":"set","name":"set new vf-module_length = vf-module-index + 1","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n","comments":"","x":1022.1668586730957,"y":263.0358591079712,"z":"91b54cc.abe6fb","wires":[]},{"id":"3a293e2a.3382a2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":738.0239143371582,"y":349.9643678665161,"z":"91b54cc.abe6fb","wires":[["8b651c5a.b4a3b","9b4dabbd.473368"]]},{"id":"15f363e3.8b92ac","type":"set","name":"set new vf-module_length++","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length + 1`' />\n","comments":"","x":1507.2739372253418,"y":461.7143726348877,"z":"91b54cc.abe6fb","wires":[]},{"id":"8b651c5a.b4a3b","type":"switchNode","name":"switch is-new-vfmodule","xml":"<switch test='`$is-new-vfmodule`'>\n","comments":"","outputs":1,"x":945.5239105224609,"y":419.5357475280762,"z":"91b54cc.abe6fb","wires":[["3b3a4098.fabb6"]]},{"id":"3b3a4098.fabb6","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1143.3810653686523,"y":419.1071949005127,"z":"91b54cc.abe6fb","wires":[["77ebcf17.0833d"]]},{"id":"9216bdc4.04dbd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":744.5239105224609,"y":242.46436214447021,"z":"91b54cc.abe6fb","wires":[["2aa88539.254a4a","d2eaae5b.c69a6"]]},{"id":"43cfb62f.bd11e8","type":"other","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":602.8571472167969,"y":280.8928565979004,"z":"91b54cc.abe6fb","wires":[["9216bdc4.04dbd"]]},{"id":"f6ea2e74.036bf","type":"switchNode","name":"switch is-new-vfmodule","xml":"<switch test='`$is-new-vfmodule`'>\n","comments":"","outputs":1,"x":388.6071472167969,"y":504.6428565979004,"z":"91b54cc.abe6fb","wires":[["e56bd1dd.cbad"]]},{"id":"e56bd1dd.cbad","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":586.4643020629883,"y":504.2143039703369,"z":"91b54cc.abe6fb","wires":[["f7fa19a6.6ffac8"]]},{"id":"ee53e5f9.e02c38","type":"set","name":"Copy vf-module-topology data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-name' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-type' \n    value='`$vf-module-topology-operation-input.vf-module-information.vf-module-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.tenant' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-cloud-region' \n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli'\n    value='`$vf-module-topology-operation-input.vf-module-request-input.aic-clli`' />","comments":"","x":1002.3571624755859,"y":549.6429262161255,"z":"91b54cc.abe6fb","wires":[]},{"id":"c9ce7d81.f6fa5","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n","comments":"","x":1367.3689231872559,"y":602.0863666534424,"z":"91b54cc.abe6fb","wires":[]},{"id":"51df8658.dfdaf8","type":"switchNode","name":"switch input model-invariant-uuid","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n","comments":"","outputs":1,"x":1011.2259979248047,"y":624.910810470581,"z":"91b54cc.abe6fb","wires":[["57ab166b.c9a278","8e1b452f.1d2198"]]},{"id":"57ab166b.c9a278","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1216.8926696777344,"y":602.0537738800049,"z":"91b54cc.abe6fb","wires":[["c9ce7d81.f6fa5"]]},{"id":"8e1b452f.1d2198","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1218.3212661743164,"y":646.3393650054932,"z":"91b54cc.abe6fb","wires":[["6717b968.3358a8"]]},{"id":"6717b968.3358a8","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n","comments":"","x":1372.6070022583008,"y":645.7679371833801,"z":"91b54cc.abe6fb","wires":[]},{"id":"dc34ea00.b18978","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n","comments":"","x":1368.3211936950684,"y":690.6250429153442,"z":"91b54cc.abe6fb","wires":[]},{"id":"37c6647e.c307dc","type":"switchNode","name":"switch input model-uuid","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n","comments":"","outputs":1,"x":983.8450164794922,"y":713.4495477676392,"z":"91b54cc.abe6fb","wires":[["79b3c03d.b218a","6c9c814f.6dcac"]]},{"id":"79b3c03d.b218a","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1217.8449897766113,"y":690.5924797058105,"z":"91b54cc.abe6fb","wires":[["dc34ea00.b18978"]]},{"id":"6c9c814f.6dcac","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1219.2735862731934,"y":734.8780708312988,"z":"91b54cc.abe6fb","wires":[["d315fdcb.a27e"]]},{"id":"d315fdcb.a27e","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n","comments":"","x":1373.5593223571777,"y":734.3066430091858,"z":"91b54cc.abe6fb","wires":[]},{"id":"25dde480.8f7ebc","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n","comments":"","x":1359.464126586914,"y":779.482250213623,"z":"91b54cc.abe6fb","wires":[]},{"id":"aefced2b.6dfb8","type":"switchNode","name":"switch input model-version","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n","comments":"","outputs":1,"x":985.9878883361816,"y":802.306694984436,"z":"91b54cc.abe6fb","wires":[["731561f3.cfc46","37e6f82.b6ecf08"]]},{"id":"731561f3.cfc46","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1208.9878730773926,"y":779.4496574401855,"z":"91b54cc.abe6fb","wires":[["25dde480.8f7ebc"]]},{"id":"37e6f82.b6ecf08","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1210.4164695739746,"y":823.7352485656738,"z":"91b54cc.abe6fb","wires":[["fdaec125.0d1ba"]]},{"id":"fdaec125.0d1ba","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-version'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n","comments":"","x":1364.702205657959,"y":823.1638207435608,"z":"91b54cc.abe6fb","wires":[]},{"id":"d0a8a05b.bad64","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n","comments":"","x":1359.464126586914,"y":866.625072479248,"z":"91b54cc.abe6fb","wires":[]},{"id":"c5a251a0.353b9","type":"switchNode","name":"switch input model-name","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n","comments":"","outputs":1,"x":982.9878883361816,"y":889.449517250061,"z":"91b54cc.abe6fb","wires":[["6bdb46ec.cf2b98","77c53d8.21703c4"]]},{"id":"6bdb46ec.cf2b98","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1208.9878730773926,"y":866.5924797058105,"z":"91b54cc.abe6fb","wires":[["d0a8a05b.bad64"]]},{"id":"77c53d8.21703c4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1210.4164695739746,"y":910.8780708312988,"z":"91b54cc.abe6fb","wires":[["f9310941.3b7978"]]},{"id":"f9310941.3b7978","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-name'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`' />\n","comments":"","x":1364.702205657959,"y":910.3066430091858,"z":"91b54cc.abe6fb","wires":[]},{"id":"fd5d17f0.6f26a8","type":"set","name":"set model-customization-uuid","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.onap-model-information.model-customization-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n","comments":"","x":996.4402465820312,"y":963.387001991272,"z":"91b54cc.abe6fb","wires":[]},{"id":"4d64c961.455a88","type":"set","name":"copy input data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.' \n    value='$vf-module-topology-operation-input.vf-module-request-input.' />","comments":"","x":953.0953216552734,"y":1018.071704864502,"z":"91b54cc.abe6fb","wires":[]},{"id":"f7fa19a6.6ffac8","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":742.5595626831055,"y":503.9920482635498,"z":"91b54cc.abe6fb","wires":[["51df8658.dfdaf8","37c6647e.c307dc","aefced2b.6dfb8","c5a251a0.353b9","fd5d17f0.6f26a8","4d64c961.455a88","ee53e5f9.e02c38","ff927cfe.36078","595cc53d.0afe7c","fd294fda.d3f2"]]},{"id":"5ec7ba5.53a6544","type":"set","name":"set vf-module-index = vf-module_length","xml":"<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n","comments":"","x":1539.8571662902832,"y":417.8928642272949,"z":"91b54cc.abe6fb","wires":[]},{"id":"77ebcf17.0833d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1286.3571662902832,"y":418.6428642272949,"z":"91b54cc.abe6fb","wires":[["5ec7ba5.53a6544","15f363e3.8b92ac"]]},{"id":"85773de1.18cd6","type":"set","name":"set error-message","xml":"<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vf-module assignments during assign in MD-SAL\" />","comments":"","x":2453.571432931083,"y":2513.2380597250803,"z":"91b54cc.abe6fb","wires":[]},{"id":"ea51742f.770a78","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":542.2857131958008,"y":2205.8096351623535,"z":"91b54cc.abe6fb","wires":[["5c76fc7c.9945a4","c3a314d.6ed30e8"]]},{"id":"c3a314d.6ed30e8","type":"break","name":"break","xml":"<break>\n","comments":"","x":719.2857197352819,"y":2648.0954072134837,"z":"91b54cc.abe6fb","wires":[]},{"id":"b94864ab.41a158","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1514.1071701049805,"y":2574.642890930176,"z":"91b54cc.abe6fb","wires":[["e31d5d91.e1082"]]},{"id":"e31d5d91.e1082","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"`'DONE: ' + $ss.capability-dg`\"/>\n\n","comments":"","outputs":1,"x":1657.8571701049805,"y":2573.392890930176,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"43c3be4e.88c54","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE with vfmodule-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":1066.6071472167969,"y":1459.6428565979004,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"6ee21bc.7790ce4","type":"execute","name":"execute PropertiesNode","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":814.8571602957591,"y":1272.857115336827,"z":"91b54cc.abe6fb","wires":[[]]},{"id":"334378e9.992958","type":"switchNode","name":"switch prop.controller.user","xml":"<switch test='`$prop.controller.user`'>\n","comments":"","outputs":1,"x":403.57139587402344,"y":1273.2857360839844,"z":"91b54cc.abe6fb","wires":[["5f059ca4.ecd6d4"]]},{"id":"5f059ca4.ecd6d4","type":"failure","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":603.428491319929,"y":1272.8571506227768,"z":"91b54cc.abe6fb","wires":[["6ee21bc.7790ce4"]]}]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json
deleted file mode 100644
index a71fa066..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.json
+++ /dev/null
@@ -1,184 +0,0 @@
-[
-    {
-        "id": "3bf8c671.7f376a",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 212.8720245361328,
-        "y": 81.44345092773438,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "dfbef821.00c2d8"
-            ]
-        ]
-    },
-    {
-        "id": "4b80a72e.2a60b8",
-        "type": "method",
-        "name": "method self-serve-vf-module-mdsal-put",
-        "xml": "<method rpc='self-serve-vf-module-mdsal-put' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 357.8839416503906,
-        "y": 146.14980506896973,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "3703bd36.764b22"
-            ]
-        ]
-    },
-    {
-        "id": "dfbef821.00c2d8",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 475.11022186279297,
-        "y": 81.63394355773926,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "4b80a72e.2a60b8"
-            ]
-        ]
-    },
-    {
-        "id": "3703bd36.764b22",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 636.6220474243164,
-        "y": 291.443452835083,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "fa0889c9.30fd08",
-                "7f28b6cc.262928",
-                "bba1c88d.c97208",
-                "8ce26831.f031e8",
-                "e45f0d28.1cec2"
-            ]
-        ]
-    },
-    {
-        "id": "fa0889c9.30fd08",
-        "type": "execute",
-        "name": "execute RestApiCallNode - PUT vf-module",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vfmodule\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1027.1694793701172,
-        "y": 409.067419052124,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "9648b461.f14b68",
-                "7d59a7d6.4df008"
-            ]
-        ]
-    },
-    {
-        "id": "9648b461.f14b68",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1310.5131568908691,
-        "y": 438.06558895111084,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "318b6c3c.6a17d4"
-            ]
-        ]
-    },
-    {
-        "id": "7d59a7d6.4df008",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1299.6917686462402,
-        "y": 384.5655927658081,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            [
-                "318b6c3c.6a17d4"
-            ]
-        ]
-    },
-    {
-        "id": "7f28b6cc.262928",
-        "type": "set",
-        "name": "set vf data for restapi-call-node",
-        "xml": "<set>\n<parameter name='vf.vf-module-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\n<parameter name='vf.vf-module-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\n<parameter name='vf.vf-module-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\n<parameter name='vf.vf-module-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\n<parameter name='vf.vf-module-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\n<parameter name='vf.vf-module-data.vf-module-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\n<parameter name='vf.vf-module-data.vf-module-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\n<parameter name='vf.vf-module-data.vf-module-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />",
-        "comments": "",
-        "x": 993.6815032958984,
-        "y": 193.18542575836182,
-        "z": "52d92258.1c8e7c",
-        "wires": []
-    },
-    {
-        "id": "bba1c88d.c97208",
-        "type": "execute",
-        "name": "generate ss-vfmodule url replace service-instance-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vfmodule-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1063.6814422607422,
-        "y": 239.93548774719238,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8ce26831.f031e8",
-        "type": "execute",
-        "name": "generate ss-vfmodule url - replace vnf-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1024.2171478271484,
-        "y": 289.24438762664795,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e45f0d28.1cec2",
-        "type": "execute",
-        "name": "generate ss-vfmodule url - replace vf-module-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1046.1578216552734,
-        "y": 339.1608877182007,
-        "z": "52d92258.1c8e7c",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "318b6c3c.6a17d4",
-        "type": "set",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to persist self-serve vf-module assignments during assign in MD-SAL. ' + $error-message`\" />",
-        "comments": "",
-        "x": 1501.0029106140137,
-        "y": 384.39960289001465,
-        "z": "52d92258.1c8e7c",
-        "wires": []
-    }
-]
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
index f8c91c7b..179abd0c 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
@@ -1,1252 +1,1253 @@
-[
-    {
-        "id": "9fc60e39.2b377",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 210,
-        "y": 88.57142639160156,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "2ec6867b.df375a"
-            ]
-        ]
-    },
-    {
-        "id": "20969099.af02a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 240.4761962890625,
-        "y": 210.84921264648438,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "3fd5632d.c7de6c",
-                "6a0b0f74.17f38",
-                "2672585d.78d398",
-                "26b42539.e67b6a",
-                "dfc91ed9.e8c0a",
-                "5bbfbcf3.457464",
-                "9d35ffb1.ce2cb",
-                "737aa51.ec59a5c",
-                "bc77197c.29eef8",
-                "ec9923c5.9922b"
-            ]
-        ]
-    },
-    {
-        "id": "8e70b457.6790f8",
-        "type": "method",
-        "name": "method self-serve-vnf-assign",
-        "xml": "<method rpc='self-serve-vnf-assign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 326.7619094848633,
-        "y": 143.27778148651123,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "20969099.af02a"
-            ]
-        ]
-    },
-    {
-        "id": "2ec6867b.df375a",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 485.23819732666016,
-        "y": 88.76191902160645,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "8e70b457.6790f8"
-            ]
-        ]
-    },
-    {
-        "id": "6a0b0f74.17f38",
-        "type": "switchNode",
-        "name": "switch vnf-parameters-data.param_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 528.6786575317383,
-        "y": 1431.0834321975708,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "4da27237.0f806c"
-            ]
-        ]
-    },
-    {
-        "id": "4da27237.0f806c",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 790.6786880493164,
-        "y": 1431.0834321975708,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "726f4a1f.8ea164"
-            ]
-        ]
-    },
-    {
-        "id": "888aa7c6.ce34c8",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:self-serve-ra-assignment",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-ra-assignment' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1305.9643478393555,
-        "y": 1480.654863357544,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "a974df23.821a7"
-            ]
-        ]
-    },
-    {
-        "id": "c16c3113.bc7e5",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n",
-        "comments": "",
-        "x": 1777.6785888671875,
-        "y": 1480.226266860962,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "64f35599.f950ac",
-        "type": "for",
-        "name": "foreach vnf-parameters-data.param[]",
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 753.8574600219727,
-        "y": 1798.5835103988647,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "11b25862.2716d8",
-                "523b1459.d48b5c"
-            ]
-        ]
-    },
-    {
-        "id": "3fd5632d.c7de6c",
-        "type": "set",
-        "name": "set ss.capability.execution-order[]",
-        "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
-        "comments": "",
-        "x": 502.52384185791016,
-        "y": 1269.571566581726,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "2672585d.78d398",
-        "type": "for",
-        "name": "foreach capability[]",
-        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 446.50011444091797,
-        "y": 1610.1190719604492,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "6c6b042c.d3a64c",
-                "aedbdfe7.8e8a4",
-                "64f35599.f950ac",
-                "34e1c505.10d7ea"
-            ]
-        ]
-    },
-    {
-        "id": "523b1459.d48b5c",
-        "type": "switchNode",
-        "name": "switch capability-name",
-        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1058.2502822875977,
-        "y": 1844.226303100586,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "6c805c7a.8fba94"
-            ]
-        ]
-    },
-    {
-        "id": "6c805c7a.8fba94",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1260.321647644043,
-        "y": 1843.9049158096313,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "87e7082f.14d0a8"
-            ]
-        ]
-    },
-    {
-        "id": "a974df23.821a7",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1623.5356941223145,
-        "y": 1480.083456993103,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "c16c3113.bc7e5"
-            ]
-        ]
-    },
-    {
-        "id": "6c6b042c.d3a64c",
-        "type": "set",
-        "name": "set ss.capability-name",
-        "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n<!--\nss.capability.execution-order[]\n-->",
-        "comments": "",
-        "x": 714.2857437133789,
-        "y": 1538.642978668213,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "11b25862.2716d8",
-        "type": "set",
-        "name": "tmp.param.capability-name",
-        "xml": "<set>\n<parameter name='tmp.param.capability-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
-        "comments": "",
-        "x": 1069.607307434082,
-        "y": 1798.8335132598877,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "aedbdfe7.8e8a4",
-        "type": "set",
-        "name": "set ss.capability-action = assign",
-        "xml": "<set>\n<parameter name='ss.capability-action' value='assign' />\n",
-        "comments": "",
-        "x": 742.999885559082,
-        "y": 1585.5595626831055,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "34e1c505.10d7ea",
-        "type": "set",
-        "name": "set capability-dg with 'self-serve-' + capability-name",
-        "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
-        "comments": "",
-        "x": 805.5119781494141,
-        "y": 1639.0358066558838,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "26b42539.e67b6a",
-        "type": "set",
-        "name": "set sdnc-generated-cloud-resources = true",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />\n",
-        "comments": "",
-        "x": 531.4881362915039,
-        "y": 1323.321575164795,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "e67789aa.f9ccd8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 787.928539276123,
-        "y": 604.0357294082642,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "bf597400.464cb8",
-                "21e596be.e5d4aa",
-                "5fcbd71.1253c28",
-                "934cd4a8.dc5ce8",
-                "ce4ca7fe.3e7cb8",
-                "7c33a884.ca3c58",
-                "edeb06d4.5eecf8",
-                "faebe95e.4f34b8",
-                "3872041e.a052dc"
-            ]
-        ]
-    },
-    {
-        "id": "bf597400.464cb8",
-        "type": "set",
-        "name": "set vnf-topology data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n",
-        "comments": "",
-        "x": 1003.4284820556641,
-        "y": 605.0952377319336,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "8f03299d.ca8b58",
-        "type": "set",
-        "name": "set vnf-parameters-data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n",
-        "comments": "",
-        "x": 1196.9645767211914,
-        "y": 1430.9522609710693,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "5fcbd71.1253c28",
-        "type": "set",
-        "name": "set vnf-level-oper-status to PendingCreate",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
-        "comments": "",
-        "x": 1068.7184371948242,
-        "y": 1179.0754470825195,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "21e596be.e5d4aa",
-        "type": "set",
-        "name": "copy input data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' \n\tvalue='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' \n\tvalue='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' \n\tvalue='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' \n\tvalue='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' \n\tvalue='$vnf-topology-operation-input.vnf-request-input.' />\n",
-        "comments": "",
-        "x": 986.0953521728516,
-        "y": 1128.8810863494873,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "fb2cfdce.8b138",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n",
-        "comments": "",
-        "x": 1400.4286727905273,
-        "y": 717.4524669647217,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "934cd4a8.dc5ce8",
-        "type": "switchNode",
-        "name": "switch input model-invariant-uuid",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1041.2857475280762,
-        "y": 740.2769107818604,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "6f767e4d.a5b3a",
-                "30cc2f98.3568c"
-            ]
-        ]
-    },
-    {
-        "id": "6f767e4d.a5b3a",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1249.9524192810059,
-        "y": 717.4198741912842,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "fb2cfdce.8b138"
-            ]
-        ]
-    },
-    {
-        "id": "30cc2f98.3568c",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1251.381015777588,
-        "y": 761.7054653167725,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "943c3d93.373b6"
-            ]
-        ]
-    },
-    {
-        "id": "943c3d93.373b6",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n",
-        "comments": "",
-        "x": 1405.6667518615723,
-        "y": 761.1340374946594,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "e7f84327.84a63",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n",
-        "comments": "",
-        "x": 1401.3809432983398,
-        "y": 805.9911432266235,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "ce4ca7fe.3e7cb8",
-        "type": "switchNode",
-        "name": "switch input model-uuid",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1010.9047660827637,
-        "y": 828.8156480789185,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "129c283a.58a938",
-                "f388a15f.e6114"
-            ]
-        ]
-    },
-    {
-        "id": "129c283a.58a938",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1250.9047393798828,
-        "y": 805.9585800170898,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "e7f84327.84a63"
-            ]
-        ]
-    },
-    {
-        "id": "f388a15f.e6114",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1252.3333358764648,
-        "y": 850.2441711425781,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "f7cc5fcf.99787"
-            ]
-        ]
-    },
-    {
-        "id": "f7cc5fcf.99787",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
-        "comments": "",
-        "x": 1406.6190719604492,
-        "y": 849.6727433204651,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "35b76f99.a7dea",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n",
-        "comments": "",
-        "x": 1398.5238761901855,
-        "y": 894.8483505249023,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "7c33a884.ca3c58",
-        "type": "switchNode",
-        "name": "switch input model-version",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1022.0476379394531,
-        "y": 917.6727952957153,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "58b3abed.100754",
-                "caf817e5.49f0e8"
-            ]
-        ]
-    },
-    {
-        "id": "58b3abed.100754",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1248.047622680664,
-        "y": 894.8157577514648,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "35b76f99.a7dea"
-            ]
-        ]
-    },
-    {
-        "id": "caf817e5.49f0e8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1249.476219177246,
-        "y": 939.1013488769531,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "ac9f727b.ef4a8"
-            ]
-        ]
-    },
-    {
-        "id": "ac9f727b.ef4a8",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n",
-        "comments": "",
-        "x": 1403.7619552612305,
-        "y": 938.5299210548401,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "28c79e76.10a892",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n",
-        "comments": "",
-        "x": 1398.5238761901855,
-        "y": 981.9911727905273,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "edeb06d4.5eecf8",
-        "type": "switchNode",
-        "name": "switch input model-name",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1017.0476379394531,
-        "y": 1004.8156175613403,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "21506f3d.981f2",
-                "aa8a9329.da852"
-            ]
-        ]
-    },
-    {
-        "id": "21506f3d.981f2",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1248.047622680664,
-        "y": 981.9585800170898,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "28c79e76.10a892"
-            ]
-        ]
-    },
-    {
-        "id": "aa8a9329.da852",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1249.476219177246,
-        "y": 1026.2441711425781,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "b6027793.3313e8"
-            ]
-        ]
-    },
-    {
-        "id": "b6027793.3313e8",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n",
-        "comments": "",
-        "x": 1403.7619552612305,
-        "y": 1025.672743320465,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "faebe95e.4f34b8",
-        "type": "set",
-        "name": "set vnf-id",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",
-        "comments": "",
-        "x": 967.4047088623047,
-        "y": 656.6102752685547,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "3872041e.a052dc",
-        "type": "set",
-        "name": "set model-customization-uuid",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n",
-        "comments": "",
-        "x": 1029.8332252502441,
-        "y": 1077.6578216552734,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "737aa51.ec59a5c",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 514.0832901000977,
-        "y": 290.99992656707764,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "c740abf8.58e428",
-                "5c2c7ae5.9ba064",
-                "1f42e923.85e837"
-            ]
-        ]
-    },
-    {
-        "id": "c740abf8.58e428",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 756.2976760864258,
-        "y": 229.55935764312744,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "22af1633.9116da"
-            ]
-        ]
-    },
-    {
-        "id": "ddc7e93e.966958",
-        "type": "set",
-        "name": "set vnf-index=0",
-        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
-        "comments": "",
-        "x": 1091.583381652832,
-        "y": 229.05943202972412,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "5c2c7ae5.9ba064",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 757.476203918457,
-        "y": 351.1785469055176,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "75a231aa.1493a"
-            ]
-        ]
-    },
-    {
-        "id": "5bbfbcf3.457464",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 406.92457580566406,
-        "y": 2612.3495638668537,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dfc91ed9.e8c0a",
-        "type": "set",
-        "name": "set ss.capability-type = vnf",
-        "xml": "<set>\n<parameter name='ss.capability-type' value='vnf' />\n",
-        "comments": "",
-        "x": 482.39292907714844,
-        "y": 1374.1072206497192,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "726f4a1f.8ea164",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 955.5356597900391,
-        "y": 1431.4643297195435,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "8f03299d.ca8b58",
-                "888aa7c6.ce34c8"
-            ]
-        ]
-    },
-    {
-        "id": "d4c51d8c.3fd83",
-        "type": "for",
-        "name": "for each existing VNF",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1104.5357284545898,
-        "y": 351.3572244644165,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "d88cbd0e.fb318"
-            ]
-        ]
-    },
-    {
-        "id": "d88cbd0e.fb318",
-        "type": "switchNode",
-        "name": "switch vnf-id: input vs service-data",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1381.821434020996,
-        "y": 351.4287118911743,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "613296f0.c41d88"
-            ]
-        ]
-    },
-    {
-        "id": "613296f0.c41d88",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1604.6072006225586,
-        "y": 351.00018405914307,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "f07dff31.8a8c5"
-            ]
-        ]
-    },
-    {
-        "id": "f07dff31.8a8c5",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1737.0714530944824,
-        "y": 351.0357446670532,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "71df4665.735218",
-                "e54095c.a974a68",
-                "2cb82547.83089a"
-            ]
-        ]
-    },
-    {
-        "id": "71df4665.735218",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 1904.964241027832,
-        "y": 437.03572273254395,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "35c0989a.5d1028",
-        "type": "set",
-        "name": "set new vnf_length = 1",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='1' />\n",
-        "comments": "",
-        "x": 1115.142951965332,
-        "y": 274.3929147720337,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "e54095c.a974a68",
-        "type": "set",
-        "name": "set vnf-index = idx",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
-        "comments": "",
-        "x": 1935.5357971191406,
-        "y": 393.82140159606934,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "9d35ffb1.ce2cb",
-        "type": "set",
-        "name": "set is-new-vnf = true",
-        "xml": "<set>\n<parameter name='is-new-vnf' value='true' />\n",
-        "comments": "",
-        "x": 468.3929214477539,
-        "y": 210.89286994934082,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "2cb82547.83089a",
-        "type": "set",
-        "name": "set is-new-vnf = false",
-        "xml": "<set>\n<parameter name='is-new-vnf' value='false' />\n",
-        "comments": "",
-        "x": 1943.5714836120605,
-        "y": 350.53574657440186,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "75a231aa.1493a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 894.7500228881836,
-        "y": 350.82144260406494,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "d4c51d8c.3fd83",
-                "a9dae2bf.27c9d"
-            ]
-        ]
-    },
-    {
-        "id": "a9dae2bf.27c9d",
-        "type": "switchNode",
-        "name": "switch is-new-vnf",
-        "xml": "<switch test='`$is-new-vnf`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1092.250015258789,
-        "y": 437.3928442001343,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "aafe48b1.4e7ba8"
-            ]
-        ]
-    },
-    {
-        "id": "aafe48b1.4e7ba8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1272.1071701049805,
-        "y": 436.9642915725708,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "8895a3c6.dce4e"
-            ]
-        ]
-    },
-    {
-        "id": "22af1633.9116da",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 910.2499923706055,
-        "y": 229.5714235305786,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "ddc7e93e.966958",
-                "35c0989a.5d1028"
-            ]
-        ]
-    },
-    {
-        "id": "1f42e923.85e837",
-        "type": "other",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 754.7499923706055,
-        "y": 289.32142543792725,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "22af1633.9116da"
-            ]
-        ]
-    },
-    {
-        "id": "bc77197c.29eef8",
-        "type": "switchNode",
-        "name": "switch is-new-vnf",
-        "xml": "<switch test='`$is-new-vnf`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 456.25000381469727,
-        "y": 604.8214321136475,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "6a808e60.77a37"
-            ]
-        ]
-    },
-    {
-        "id": "6a808e60.77a37",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 636.1071586608887,
-        "y": 604.392879486084,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "e67789aa.f9ccd8"
-            ]
-        ]
-    },
-    {
-        "id": "204b0359.b69b9c",
-        "type": "set",
-        "name": "set new vnf_length++",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$service-data.vnfs.vnf_length + 1`' />\n",
-        "comments": "",
-        "x": 1620,
-        "y": 483.57142639160156,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "8895a3c6.dce4e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1417.9999771118164,
-        "y": 436.5713882446289,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "204b0359.b69b9c",
-                "5e9aebe.a0a8114"
-            ]
-        ]
-    },
-    {
-        "id": "5e9aebe.a0a8114",
-        "type": "set",
-        "name": "set vnf-index = vnf_length",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
-        "comments": "",
-        "x": 1629.4999809265137,
-        "y": 436.0713882446289,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "71d531a5.f9c57",
-        "type": "switchNode",
-        "name": "switch resource-resolution-data.status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1017.1429252624512,
-        "y": 2015.7144899368286,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "95915292.b1cbe",
-                "8847833b.7e141"
-            ]
-        ]
-    },
-    {
-        "id": "95915292.b1cbe",
-        "type": "other",
-        "name": "PENDING",
-        "xml": "<outcome value='PENDING'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1286.5001411437988,
-        "y": 2015.71444606781,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "a8f748b4.9f28e8"
-            ]
-        ]
-    },
-    {
-        "id": "8847833b.7e141",
-        "type": "other",
-        "name": "FAILED",
-        "xml": "<outcome value='FAILED'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1280.0359573364258,
-        "y": 2066.678776741028,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "a8f748b4.9f28e8"
-            ]
-        ]
-    },
-    {
-        "id": "a8f748b4.9f28e8",
-        "type": "call",
-        "name": "call ss.capability-dg",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1495.1546897888184,
-        "y": 2067.440628051758,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "2dd36be3.cf5d44",
-                "d2b8fc6a.176c9"
-            ]
-        ]
-    },
-    {
-        "id": "2dd36be3.cf5d44",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1700.04732131958,
-        "y": 2067.4406547546387,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "8dbc33f.2629cd"
-            ]
-        ]
-    },
-    {
-        "id": "87e7082f.14d0a8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 751.2735900878906,
-        "y": 2015.527940750122,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "71d531a5.f9c57",
-                "90286397.09b08"
-            ]
-        ]
-    },
-    {
-        "id": "90286397.09b08",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 915.5593299865723,
-        "y": 2391.813596725464,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "d2b8fc6a.176c9",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1709.844985961914,
-        "y": 2240.7424488067627,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "3117d1e3.ae428e"
-            ]
-        ]
-    },
-    {
-        "id": "3117d1e3.ae428e",
-        "type": "record",
-        "name": "record",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"`'EXECUTION DONE: ' + $ss.capability-dg`\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1853.594985961914,
-        "y": 2239.4924488067627,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9525749b.e0a2a8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 2113.952507019043,
-        "y": 2156.206455230713,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "8dbc33f.2629cd",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1889.3931884765625,
-        "y": 2067.4322185516357,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            [
-                "9525749b.e0a2a8",
-                "54bc9834.e72248",
-                "175c4397.c22a6c"
-            ]
-        ]
-    },
-    {
-        "id": "54bc9834.e72248",
-        "type": "call",
-        "name": "call self-serve-vnf-mdsal-put",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2162.8811264038086,
-        "y": 2112.328701019287,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "175c4397.c22a6c",
-        "type": "set",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name='error-message' value=\"`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`\" />",
-        "comments": "",
-        "x": 2126.8100253513876,
-        "y": 2066.971579824175,
-        "z": "2d409653.5d1eca",
-        "wires": []
-    },
-    {
-        "id": "ec9923c5.9922b",
-        "type": "call",
-        "name": "call self-serve-vnf-mdsal-put",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 463.95216369628906,
-        "y": 2499.492456436157,
-        "z": "2d409653.5d1eca",
-        "wires": [
-            []
-        ]
-    }
-]
-\ No newline at end of file
+[
+  {
+    "id": "d69b4aac.647588",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 121.66666412353516,
+    "y": 59.999996185302734,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "2849e3b8.45bb9c"
+      ]
+    ]
+  },
+  {
+    "id": "853836ae.79c2a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 152.14286041259766,
+    "y": 182.27778244018555,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "57aa1f79.ff47b",
+        "fdd51c96.2d89",
+        "5ac18b5f.1d7c44",
+        "29496a14.3d5ef6",
+        "cf3af1fb.cae0d",
+        "2989260.b2650da",
+        "442acc2c.485fa4",
+        "595e6289.903d8c",
+        "2e34ccd3.bb5994"
+      ]
+    ]
+  },
+  {
+    "id": "8eef5a36.786b28",
+    "type": "method",
+    "name": "method self-serve-vnf-assign",
+    "xml": "<method rpc='self-serve-vnf-assign' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 238.42857360839844,
+    "y": 114.7063512802124,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "853836ae.79c2a8"
+      ]
+    ]
+  },
+  {
+    "id": "2849e3b8.45bb9c",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 396.9048614501953,
+    "y": 60.19048881530762,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "8eef5a36.786b28"
+      ]
+    ]
+  },
+  {
+    "id": "fdd51c96.2d89",
+    "type": "switchNode",
+    "name": "switch vnf-parameters-data.param_length",
+    "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 440.34532165527344,
+    "y": 1402.512001991272,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "60e3d6fb.cf4158"
+      ]
+    ]
+  },
+  {
+    "id": "60e3d6fb.cf4158",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 702.3453521728516,
+    "y": 1402.512001991272,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "d6105627.c8e418"
+      ]
+    ]
+  },
+  {
+    "id": "b53240df.c07bf",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:self-serve-ra-assignment",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-ra-assignment' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1217.6310119628906,
+    "y": 1452.0834331512451,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "2e191127.f108ee"
+      ]
+    ]
+  },
+  {
+    "id": "5891962b.ba3ee8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n",
+    "comments": "",
+    "x": 1689.3452529907227,
+    "y": 1451.654836654663,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "6efb148b.cf375c",
+    "type": "for",
+    "name": "foreach vnf-parameters-data.param[]",
+    "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 665.5241241455078,
+    "y": 1770.012080192566,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "65887e2e.f61d8",
+        "52e1b29f.bb361c"
+      ]
+    ]
+  },
+  {
+    "id": "57aa1f79.ff47b",
+    "type": "set",
+    "name": "set ss.capability.execution-order[]",
+    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
+    "comments": "",
+    "x": 414.1905059814453,
+    "y": 1241.0001363754272,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "5ac18b5f.1d7c44",
+    "type": "for",
+    "name": "foreach capability[]",
+    "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 369.59535217285156,
+    "y": 1510.1190967559814,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "38b7eff2.abaa",
+        "d79a38d7.5d4d98",
+        "6efb148b.cf375c",
+        "13e94191.0506de"
+      ]
+    ]
+  },
+  {
+    "id": "52e1b29f.bb361c",
+    "type": "switchNode",
+    "name": "switch capability-name",
+    "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 969.9169464111328,
+    "y": 1815.654872894287,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "e9beff60.c1b47"
+      ]
+    ]
+  },
+  {
+    "id": "e9beff60.c1b47",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1233.4169464111328,
+    "y": 1815.904872894287,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "5bdd6d8.cb05594"
+      ]
+    ]
+  },
+  {
+    "id": "2e191127.f108ee",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1535.2023582458496,
+    "y": 1451.5120267868042,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "5891962b.ba3ee8"
+      ]
+    ]
+  },
+  {
+    "id": "38b7eff2.abaa",
+    "type": "set",
+    "name": "set ss.capability-name",
+    "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n<!--\nss.capability.execution-order[]\n-->",
+    "comments": "",
+    "x": 625.9524078369141,
+    "y": 1510.071548461914,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "65887e2e.f61d8",
+    "type": "set",
+    "name": "tmp.param.capability-name",
+    "xml": "<set>\n<parameter name='tmp.param.capability-name' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
+    "comments": "",
+    "x": 981.2739715576172,
+    "y": 1770.2620830535889,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "d79a38d7.5d4d98",
+    "type": "set",
+    "name": "set ss.capability-action = assign",
+    "xml": "<set>\n<parameter name='ss.capability-action' value='assign' />\n",
+    "comments": "",
+    "x": 654.6665496826172,
+    "y": 1556.9881324768066,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "13e94191.0506de",
+    "type": "set",
+    "name": "set capability-dg with 'self-serve-' + capability-name",
+    "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
+    "comments": "",
+    "x": 717.1786422729492,
+    "y": 1610.464376449585,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "29496a14.3d5ef6",
+    "type": "set",
+    "name": "set sdnc-generated-cloud-resources = true",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />\n",
+    "comments": "",
+    "x": 443.15480041503906,
+    "y": 1294.750144958496,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "8cef310a.fddca",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 699.5952033996582,
+    "y": 575.4642992019653,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "cb0b24ee.fbda78",
+        "4678e991.fe0228",
+        "891158b7.7641c8",
+        "19bb5ed9.08b021",
+        "6dc3189.4dc75e8",
+        "7f0c1909.1cc738",
+        "29aed783.5eada8",
+        "b2f7bf66.a949e",
+        "2cb1cef8.ac7872"
+      ]
+    ]
+  },
+  {
+    "id": "cb0b24ee.fbda78",
+    "type": "set",
+    "name": "set vnf-topology data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n",
+    "comments": "",
+    "x": 915.0951461791992,
+    "y": 576.5238075256348,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "8d586e30.441d2",
+    "type": "set",
+    "name": "set vnf-parameters-data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n",
+    "comments": "",
+    "x": 1108.6312408447266,
+    "y": 1402.3808307647705,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "891158b7.7641c8",
+    "type": "set",
+    "name": "set vnf-level-oper-status to PendingCreate",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
+    "comments": "",
+    "x": 980.3851013183594,
+    "y": 1150.5040168762207,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "4678e991.fe0228",
+    "type": "set",
+    "name": "copy input data",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' \n\tvalue='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' \n\tvalue='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' \n\tvalue='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' \n\tvalue='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' \n\tvalue='$vnf-topology-operation-input.vnf-request-input.' />\n",
+    "comments": "",
+    "x": 897.7620162963867,
+    "y": 1100.3096561431885,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "f2f46e9c.cd6da",
+    "type": "set",
+    "name": "set from DB",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n",
+    "comments": "",
+    "x": 1312.0953369140625,
+    "y": 688.8810367584229,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "19bb5ed9.08b021",
+    "type": "switchNode",
+    "name": "switch input model-invariant-uuid",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 952.9524116516113,
+    "y": 711.7054805755615,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "59da9427.77060c",
+        "e199643e.d97208"
+      ]
+    ]
+  },
+  {
+    "id": "59da9427.77060c",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1161.619083404541,
+    "y": 688.8484439849854,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "f2f46e9c.cd6da"
+      ]
+    ]
+  },
+  {
+    "id": "e199643e.d97208",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1163.047679901123,
+    "y": 733.1340351104736,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "e42ceacb.598138"
+      ]
+    ]
+  },
+  {
+    "id": "e42ceacb.598138",
+    "type": "set",
+    "name": "set from input",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n",
+    "comments": "",
+    "x": 1317.3334159851074,
+    "y": 732.5626072883606,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "29f5b35d.29bc7c",
+    "type": "set",
+    "name": "set from DB",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n",
+    "comments": "",
+    "x": 1313.047607421875,
+    "y": 777.4197130203247,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "6dc3189.4dc75e8",
+    "type": "switchNode",
+    "name": "switch input model-uuid",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 922.5714302062988,
+    "y": 800.2442178726196,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "8c03daa9.ef0868",
+        "8ef01a18.f777c8"
+      ]
+    ]
+  },
+  {
+    "id": "8c03daa9.ef0868",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1162.571403503418,
+    "y": 777.387149810791,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "29f5b35d.29bc7c"
+      ]
+    ]
+  },
+  {
+    "id": "8ef01a18.f777c8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1164,
+    "y": 821.6727409362793,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "8f583b38.b3ca88"
+      ]
+    ]
+  },
+  {
+    "id": "8f583b38.b3ca88",
+    "type": "set",
+    "name": "set from input",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
+    "comments": "",
+    "x": 1318.2857360839844,
+    "y": 821.1013131141663,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "8ecfcd2a.b444f",
+    "type": "set",
+    "name": "set from DB",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n",
+    "comments": "",
+    "x": 1310.1905403137207,
+    "y": 866.2769203186035,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "7f0c1909.1cc738",
+    "type": "switchNode",
+    "name": "switch input model-version",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 933.7143020629883,
+    "y": 889.1013650894165,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "70b1cafe.70c534",
+        "e0d33652.2c6678"
+      ]
+    ]
+  },
+  {
+    "id": "70b1cafe.70c534",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1159.7142868041992,
+    "y": 866.244327545166,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "8ecfcd2a.b444f"
+      ]
+    ]
+  },
+  {
+    "id": "e0d33652.2c6678",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1161.1428833007812,
+    "y": 910.5299186706543,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "b303ac7b.e45d2"
+      ]
+    ]
+  },
+  {
+    "id": "b303ac7b.e45d2",
+    "type": "set",
+    "name": "set from input",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n",
+    "comments": "",
+    "x": 1315.4286193847656,
+    "y": 909.9584908485413,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "a0c9d49b.ad59b8",
+    "type": "set",
+    "name": "set from DB",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n",
+    "comments": "",
+    "x": 1310.1905403137207,
+    "y": 953.4197425842285,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "29aed783.5eada8",
+    "type": "switchNode",
+    "name": "switch input model-name",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 928.7143020629883,
+    "y": 976.2441873550415,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "e66234a9.911278",
+        "adbe9c1f.f9c78"
+      ]
+    ]
+  },
+  {
+    "id": "e66234a9.911278",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1159.7142868041992,
+    "y": 953.387149810791,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "a0c9d49b.ad59b8"
+      ]
+    ]
+  },
+  {
+    "id": "adbe9c1f.f9c78",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1161.1428833007812,
+    "y": 997.6727409362793,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "df7a880.bcfde78"
+      ]
+    ]
+  },
+  {
+    "id": "df7a880.bcfde78",
+    "type": "set",
+    "name": "set from input",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n",
+    "comments": "",
+    "x": 1315.4286193847656,
+    "y": 997.1013131141663,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "b2f7bf66.a949e",
+    "type": "set",
+    "name": "set vnf-id",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",
+    "comments": "",
+    "x": 879.0713729858398,
+    "y": 628.0388450622559,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "2cb1cef8.ac7872",
+    "type": "set",
+    "name": "set model-customization-uuid",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n",
+    "comments": "",
+    "x": 941.4998893737793,
+    "y": 1049.0863914489746,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "595e6289.903d8c",
+    "type": "switchNode",
+    "name": "switch service-data.vnfs.vnf_length",
+    "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 425.7499542236328,
+    "y": 262.4284963607788,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "18255159.e40b7f",
+        "772fa4ef.017aac",
+        "1c932b60.e73ca5"
+      ]
+    ]
+  },
+  {
+    "id": "18255159.e40b7f",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 667.9643402099609,
+    "y": 200.9879274368286,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "92b4b346.1e12f"
+      ]
+    ]
+  },
+  {
+    "id": "548cf92c.4ba008",
+    "type": "set",
+    "name": "set vnf-index=0",
+    "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
+    "comments": "",
+    "x": 1003.2500457763672,
+    "y": 200.4880018234253,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "772fa4ef.017aac",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 669.1428680419922,
+    "y": 322.60711669921875,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "7437693b.b40168"
+      ]
+    ]
+  },
+  {
+    "id": "5bdd6d8.cb05594",
+    "type": "switchNode",
+    "name": "switch resource-resolution-data.status",
+    "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 504.6788749694824,
+    "y": 2072.472294807434,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "87166833.ca4098",
+        "68489653.550b68"
+      ]
+    ]
+  },
+  {
+    "id": "87166833.ca4098",
+    "type": "other",
+    "name": "PENDING",
+    "xml": "<outcome value='PENDING'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 774.0360908508301,
+    "y": 2072.4722509384155,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "a28cc088.525e6"
+      ]
+    ]
+  },
+  {
+    "id": "68489653.550b68",
+    "type": "other",
+    "name": "FAILED",
+    "xml": "<outcome value='FAILED'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 767.571907043457,
+    "y": 2123.4365816116333,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "a28cc088.525e6"
+      ]
+    ]
+  },
+  {
+    "id": "a28cc088.525e6",
+    "type": "call",
+    "name": "call ss.capability-dg",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 982.6906394958496,
+    "y": 2124.1984329223633,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "82a3fc61.8f2e5"
+      ]
+    ]
+  },
+  {
+    "id": "71a33c12.b5a3d4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`\" />\n",
+    "comments": "",
+    "x": 1550.238079071045,
+    "y": 2378.17488861084,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "82a3fc61.8f2e5",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1167.5831489562988,
+    "y": 2124.1984939575195,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "1db677fa.c5f998"
+      ]
+    ]
+  },
+  {
+    "id": "1db677fa.c5f998",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1330.857265472412,
+    "y": 2123.5080347061157,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "71a33c12.b5a3d4",
+        "e1fec547.7327d8",
+        "c36d6a8.879dc98",
+        "32c8d030.41dd8",
+        "c0352a22.0df598"
+      ]
+    ]
+  },
+  {
+    "id": "c36d6a8.879dc98",
+    "type": "execute",
+    "name": "generate ss-vnf url replace service-instance-id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vnf-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1654.190357208252,
+    "y": 2177.024594306946,
+    "z": "2539c931.d4e596",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c0352a22.0df598",
+    "type": "execute",
+    "name": "execute RestApiCallNode - PUT vnf",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vnf\" />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1623.6546516418457,
+    "y": 2279.8818159103394,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "9f3adb33.27f9d8",
+        "d80b620b.99918"
+      ]
+    ]
+  },
+  {
+    "id": "9f3adb33.27f9d8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1898.2483177185059,
+    "y": 2333.879969596863,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "b1619288.dfed9"
+      ]
+    ]
+  },
+  {
+    "id": "d80b620b.99918",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1890.6769523620605,
+    "y": 2280.3799896240234,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "b1619288.dfed9"
+      ]
+    ]
+  },
+  {
+    "id": "e1fec547.7327d8",
+    "type": "set",
+    "name": "set vf data for restapi-call-node",
+    "xml": "<set>\n<parameter name='vf.vnf-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />\n<parameter name='vf.vnf-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />\n<parameter name='vf.vnf-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />\n<parameter name='vf.vnf-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />\n<parameter name='vf.vnf-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />\n<parameter name='vf.vnf-data.vnf-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />\n<parameter name='vf.vnf-data.vnf-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='vf.vnf-data.vnf-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />\n<parameter name='vf.vnf-data.vnf-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />",
+    "comments": "",
+    "x": 1606.6426582336426,
+    "y": 2123.1191062927246,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "32c8d030.41dd8",
+    "type": "execute",
+    "name": "generate ss-vnf url - replace vnf-id",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vnf-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-id`\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1618.4760627746582,
+    "y": 2227.8333625793457,
+    "z": "2539c931.d4e596",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2989260.b2650da",
+    "type": "execute",
+    "name": "printContext",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 370.019775390625,
+    "y": 2572.3494453430176,
+    "z": "2539c931.d4e596",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cf3af1fb.cae0d",
+    "type": "set",
+    "name": "set ss.capability-type = vnf",
+    "xml": "<set>\n<parameter name='ss.capability-type' value='vnf' />\n",
+    "comments": "",
+    "x": 394.0595932006836,
+    "y": 1345.5357904434204,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "d6105627.c8e418",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 867.2023239135742,
+    "y": 1402.8928995132446,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "8d586e30.441d2",
+        "b53240df.c07bf"
+      ]
+    ]
+  },
+  {
+    "id": "727eaad0.1e6e64",
+    "type": "for",
+    "name": "for each existing VNF",
+    "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1016.202392578125,
+    "y": 322.7857942581177,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "f9213ecd.2658a"
+      ]
+    ]
+  },
+  {
+    "id": "f9213ecd.2658a",
+    "type": "switchNode",
+    "name": "switch vnf-id: input vs service-data",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1293.4880981445312,
+    "y": 322.8572816848755,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "6fc117d2.eaa0b8"
+      ]
+    ]
+  },
+  {
+    "id": "6fc117d2.eaa0b8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1516.2738647460938,
+    "y": 322.42875385284424,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "f035c4cb.688108"
+      ]
+    ]
+  },
+  {
+    "id": "f035c4cb.688108",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1648.7381172180176,
+    "y": 322.4643144607544,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "ddc53ec7.8a8ad",
+        "a4bfc95d.69a428",
+        "99a6f232.c02bc"
+      ]
+    ]
+  },
+  {
+    "id": "ddc53ec7.8a8ad",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 1816.6309051513672,
+    "y": 408.4642925262451,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "4d1804cd.00019c",
+    "type": "set",
+    "name": "set new vnf_length = 1",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='1' />\n",
+    "comments": "",
+    "x": 1026.8096160888672,
+    "y": 245.82148456573486,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "a4bfc95d.69a428",
+    "type": "set",
+    "name": "set vnf-index = idx",
+    "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
+    "comments": "",
+    "x": 1847.2024612426758,
+    "y": 365.2499713897705,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "442acc2c.485fa4",
+    "type": "set",
+    "name": "set is-new-vnf = true",
+    "xml": "<set>\n<parameter name='is-new-vnf' value='true' />\n",
+    "comments": "",
+    "x": 380.05958557128906,
+    "y": 182.321439743042,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "99a6f232.c02bc",
+    "type": "set",
+    "name": "set is-new-vnf = false",
+    "xml": "<set>\n<parameter name='is-new-vnf' value='false' />\n",
+    "comments": "",
+    "x": 1855.2381477355957,
+    "y": 321.964316368103,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "7437693b.b40168",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 806.4166870117188,
+    "y": 322.2500123977661,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "727eaad0.1e6e64",
+        "fb374db8.2b8eb"
+      ]
+    ]
+  },
+  {
+    "id": "fb374db8.2b8eb",
+    "type": "switchNode",
+    "name": "switch is-new-vnf",
+    "xml": "<switch test='`$is-new-vnf`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1003.9166793823242,
+    "y": 408.82141399383545,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "e7bfcf3d.b7f14"
+      ]
+    ]
+  },
+  {
+    "id": "e7bfcf3d.b7f14",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1183.7738342285156,
+    "y": 408.392861366272,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "aecd914d.44c7b"
+      ]
+    ]
+  },
+  {
+    "id": "92b4b346.1e12f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 821.9166564941406,
+    "y": 200.99999332427979,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "548cf92c.4ba008",
+        "4d1804cd.00019c"
+      ]
+    ]
+  },
+  {
+    "id": "1c932b60.e73ca5",
+    "type": "other",
+    "name": "0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 666.4166564941406,
+    "y": 260.7499952316284,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "92b4b346.1e12f"
+      ]
+    ]
+  },
+  {
+    "id": "2e34ccd3.bb5994",
+    "type": "switchNode",
+    "name": "switch is-new-vnf",
+    "xml": "<switch test='`$is-new-vnf`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 367.9166679382324,
+    "y": 576.2500019073486,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "1c1e89f5.887da6"
+      ]
+    ]
+  },
+  {
+    "id": "1c1e89f5.887da6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 547.7738227844238,
+    "y": 575.8214492797852,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "8cef310a.fddca"
+      ]
+    ]
+  },
+  {
+    "id": "535721ac.1a29a",
+    "type": "set",
+    "name": "set new vnf_length++",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$service-data.vnfs.vnf_length + 1`' />\n",
+    "comments": "",
+    "x": 1531.6666641235352,
+    "y": 454.99999618530273,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "aecd914d.44c7b",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1329.6666412353516,
+    "y": 407.9999580383301,
+    "z": "2539c931.d4e596",
+    "wires": [
+      [
+        "535721ac.1a29a",
+        "189baa3c.c7d166"
+      ]
+    ]
+  },
+  {
+    "id": "189baa3c.c7d166",
+    "type": "set",
+    "name": "set vnf-index = vnf_length",
+    "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
+    "comments": "",
+    "x": 1541.1666450500488,
+    "y": 407.4999580383301,
+    "z": "2539c931.d4e596",
+    "wires": []
+  },
+  {
+    "id": "b1619288.dfed9",
+    "type": "set",
+    "name": "set error-message",
+    "xml": "<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vnf assignments during assign in MD-SAL\" />",
+    "comments": "",
+    "x": 2110.5952758789062,
+    "y": 2279.2499961853027,
+    "z": "2539c931.d4e596",
+    "wires": []
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.json
deleted file mode 100644
index 2124ccf9..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.json
+++ /dev/null
@@ -1,169 +0,0 @@
-[
-    {
-        "id": "56afbbe7.ef1b04",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 192.8720245361328,
-        "y": 121.44345092773438,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "4cb200e9.a9147"
-            ]
-        ]
-    },
-    {
-        "id": "1e0bb80b.2c8618",
-        "type": "method",
-        "name": "method self-serve-vnf-mdsal-put",
-        "xml": "<method rpc='self-serve-vnf-mdsal-put' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 340.7410888671875,
-        "y": 213.29266166687012,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "54b0d2ab.4cd77c"
-            ]
-        ]
-    },
-    {
-        "id": "4cb200e9.a9147",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 455.11022186279297,
-        "y": 121.63394355773926,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "1e0bb80b.2c8618"
-            ]
-        ]
-    },
-    {
-        "id": "54b0d2ab.4cd77c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 593.7769775390625,
-        "y": 394.4038600921631,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "fc67bb15.636f18",
-                "ed1a2851.984f28",
-                "5dff0dd.b9c11f4",
-                "f0753190.147fa"
-            ]
-        ]
-    },
-    {
-        "id": "ed1a2851.984f28",
-        "type": "execute",
-        "name": "generate ss-vnf url replace service-instance-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vnf-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 952.8243865966797,
-        "y": 353.6346740722656,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f0753190.147fa",
-        "type": "execute",
-        "name": "execute RestApiCallNode - PUT vnf",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vnf\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 908.0029144287109,
-        "y": 542.2061910629272,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "f8cd63cc.a44ab",
-                "843810fe.b2d4e"
-            ]
-        ]
-    },
-    {
-        "id": "f8cd63cc.a44ab",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1185.453758239746,
-        "y": 569.0614757537842,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "b45b5260.c22ef"
-            ]
-        ]
-    },
-    {
-        "id": "843810fe.b2d4e",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1177.8823928833008,
-        "y": 515.5614957809448,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            [
-                "b45b5260.c22ef"
-            ]
-        ]
-    },
-    {
-        "id": "fc67bb15.636f18",
-        "type": "set",
-        "name": "set vf data for restapi-call-node",
-        "xml": "<set>\n<parameter name='vf.vnf-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />\n<parameter name='vf.vnf-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />\n<parameter name='vf.vnf-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />\n<parameter name='vf.vnf-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />\n<parameter name='vf.vnf-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />\n<parameter name='vf.vnf-data.vnf-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />\n<parameter name='vf.vnf-data.vnf-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='vf.vnf-data.vnf-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />\n<parameter name='vf.vnf-data.vnf-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />",
-        "comments": "",
-        "x": 902.4194869995117,
-        "y": 284.01490211486816,
-        "z": "3ce368a2.78f878",
-        "wires": []
-    },
-    {
-        "id": "5dff0dd.b9c11f4",
-        "type": "execute",
-        "name": "generate ss-vnf url - replace vnf-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vnf-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 911.3957901000977,
-        "y": 438.7291421890259,
-        "z": "3ce368a2.78f878",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b45b5260.c22ef",
-        "type": "set",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to persist self-serve vnf assignments during assign in MD-SAL. ' + $error-message`\" />",
-        "comments": "",
-        "x": 1397.8007164001465,
-        "y": 514.4315023422241,
-        "z": "3ce368a2.78f878",
-        "wires": []
-    }
-]
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
index ab685311..97404397 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "b9191fa3.7ca61",
+        "id": "3c926793.88f8e8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 156.2630157470703,
-        "y": 88.76301574707031,
-        "z": "565447bf.1f1598",
+        "x": 112,
+        "y": 77.02430057525635,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dd8ef904.2a0718"
+                "8e22c419.c359c8"
             ]
         ]
     },
     {
-        "id": "dd8ef904.2a0718",
+        "id": "8e22c419.c359c8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,7151 +22,6496 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1-4-2-20181108R1'>",
         "outputs": 1,
-        "x": 270.1201515197754,
-        "y": 128.57255363464355,
-        "z": "565447bf.1f1598",
+        "x": 225.85713577270508,
+        "y": 116.83383846282959,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "79e996c5.93c4a8"
+                "5f18dcaf.1733e4"
             ]
         ]
     },
     {
-        "id": "79e996c5.93c4a8",
+        "id": "5f18dcaf.1733e4",
         "type": "method",
         "name": "method vf-module-topology-operation-assign",
         "xml": "<method rpc='vf-module-topology-operation-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 269.69164276123047,
-        "y": 168.7630157470703,
-        "z": "565447bf.1f1598",
+        "x": 225.42862701416016,
+        "y": 157.02430057525635,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fb67aa4b.8284f8"
+                "bfee1c79.25f4d"
             ]
         ]
     },
     {
-        "id": "f89d4b47.20f5c8",
+        "id": "fd852c3d.9d104",
         "type": "comment",
         "name": "vf-module-topology-operation-assign",
         "info": "",
         "comments": "",
-        "x": 561.584114074707,
-        "y": 31.738715171813965,
-        "z": "565447bf.1f1598",
+        "x": 517.3210983276367,
+        "y": 20,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "5d7e2c45.4ebe34",
+        "id": "5621ecb6.141394",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 562.7035369873047,
-        "y": 365.53680992126465,
-        "z": "565447bf.1f1598",
+        "x": 517.1905097961426,
+        "y": 332.548122882843,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d3c6b720.c14d58",
-                "9bb35c39.b1fef"
+                "27ea8761.a38d7",
+                "39338a50.ba0c9e"
             ]
         ]
     },
     {
-        "id": "d3c6b720.c14d58",
+        "id": "27ea8761.a38d7",
         "type": "outcome",
         "name": "CreateVfModuleInstance",
         "xml": "<outcome value='CreateVfModuleInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 833.5011749267578,
-        "y": 333.92968559265137,
-        "z": "565447bf.1f1598",
+        "x": 779.2381248474121,
+        "y": 309.6910090446472,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a73a78b9.a830b8"
+                "e24ff94b.792af8"
             ]
         ]
     },
     {
-        "id": "9bb35c39.b1fef",
+        "id": "39338a50.ba0c9e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.417797088623,
-        "y": 398.06068897247314,
-        "z": "565447bf.1f1598",
+        "x": 722.9047698974609,
+        "y": 355.07199811935425,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3e5eb577.046eda"
+                "d1fcb1c9.df0ba"
             ]
         ]
     },
     {
-        "id": "a73a78b9.a830b8",
+        "id": "e24ff94b.792af8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1023.3583393096924,
-        "y": 333.9297170639038,
-        "z": "565447bf.1f1598",
+        "x": 969.0952892303467,
+        "y": 309.69104051589966,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "48e25fc2.52f7",
+        "id": "d1fcb1c9.df0ba",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'\" />\n",
+        "comments": "",
+        "x": 987.9047775268555,
+        "y": 355.40531063079834,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "b13c4350.370938",
         "type": "get-resource",
         "name": "get-resource VF_MODULE_MODEL",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-module-model'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 610.0368041992188,
-        "y": 466.6797637939453,
-        "z": "565447bf.1f1598",
+        "x": 564.5237770080566,
+        "y": 423.6910729408264,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c0e16531.bf13d8",
-                "3ed7b745.5102d8"
+                "571b8345.3afedc",
+                "dee1e46d.9ae7c8"
             ]
         ]
     },
     {
-        "id": "c0e16531.bf13d8",
+        "id": "e0e2e8ab.4a9f9",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />\n",
+        "comments": "",
+        "x": 1005.9521980285645,
+        "y": 448.1195454597473,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "571b8345.3afedc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 875.8224945068359,
-        "y": 447.0605945587158,
-        "z": "565447bf.1f1598",
+        "x": 830.3094673156738,
+        "y": 404.0719037055969,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2172bacb.fd1c86"
+                "a50bc128.476618"
             ]
         ]
     },
     {
-        "id": "3ed7b745.5102d8",
+        "id": "dee1e46d.9ae7c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 884.3939247131348,
-        "y": 491.3463077545166,
-        "z": "565447bf.1f1598",
+        "x": 838.8808975219727,
+        "y": 448.3576169013977,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c639de59.ae251"
+                "e0e2e8ab.4a9f9"
             ]
         ]
     },
     {
-        "id": "9d5245b6.abb4e8",
+        "id": "a50bc128.476618",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
+        "comments": "",
+        "x": 1005.309398651123,
+        "y": 403.21480417251587,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "fe2663d3.ad286",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 603.8820571899414,
-        "y": 644.0011234283447,
-        "z": "565447bf.1f1598",
+        "x": 559.6190414428711,
+        "y": 632.2624082565308,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "128f7183.82d7ae",
-                "6a25eddf.15bb44"
+                "c2c56698.b84c38",
+                "69d3fcd2.10cc54"
             ]
         ]
     },
     {
-        "id": "128f7183.82d7ae",
+        "id": "c2c56698.b84c38",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 844.5963287353516,
-        "y": 620.1438636779785,
-        "z": "565447bf.1f1598",
+        "x": 800.3333129882812,
+        "y": 609.4051485061646,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dbfaf511.5478b8"
+                "71fe3c04.e95c14"
             ]
         ]
     },
     {
-        "id": "6a25eddf.15bb44",
+        "id": "69d3fcd2.10cc54",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 844.3581695556641,
-        "y": 662.0963821411133,
-        "z": "565447bf.1f1598",
+        "x": 800.0951538085938,
+        "y": 650.3576669692993,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7ef59497.ea72ec"
+                "f260a284.46dcc"
             ]
         ]
     },
     {
-        "id": "94a28d82.4f01d",
+        "id": "72f655d6.4f3d74",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 182.45345306396484,
-        "y": 3125.668021798134,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "1c68463e.c02a4a",
-                "135adbdd.c9ef24",
-                "86ef2c44.55f05",
-                "e4caf1eb.a8b9f",
-                "7c9996aa.a5c0f8",
-                "e1558384.bfa8e",
-                "b08a4dbf.cf985",
-                "f888462e.a53c78",
-                "7293e3b2.a19a7c",
-                "2a3992a0.134e1e",
-                "2162f1f4.5f96fe",
-                "ff74ebeb.c5ffd8",
-                "489025cd.dbd3ac",
-                "59bf9724.469638",
-                "474227b8.b83ae8",
-                "1d003263.e8205e",
-                "75a8181a.0cae18",
-                "35a859e5.3e7c46",
-                "24109bc2.4c9eb4",
-                "c7aef34d.6997b",
-                "7ffbcb4d.5fb274",
-                "779079fc.7d1618",
-                "494a4418.4600ec",
-                "88b43b76.6a75d8",
-                "bb67c127.33c7c",
-                "67fa2696.640ed8",
-                "fcaf9b9.f1d4568",
-                "9926c7ad.248aa8",
-                "7b6a70b.67d389",
-                "42e09bf7.400e44",
-                "d9542f83.7d0bb",
-                "e283e90a.9eb6c8",
-                "50d368a6.9adce8"
-            ]
-        ]
-    },
-    {
-        "id": "7ef59497.ea72ec",
+        "x": 138.19043731689453,
+        "y": 3113.92930662632,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "32d3cb49.a3ac2c",
+                "bd2a2adb.54955",
+                "47c04218.47c91c",
+                "5d68b4f6.9bd994",
+                "4cbe79da.e231f8",
+                "2b324bfd.26e0fc",
+                "ed77dce7.269d88",
+                "62ca20ce.f4db7",
+                "cd265369.c8e4",
+                "4772b1e6.c27368",
+                "533af805.057888",
+                "acb49220.447a5",
+                "7f55025b.b643ec",
+                "87463151.06bbf8",
+                "5dbea689.bf65d8",
+                "b96e4724.95afc",
+                "9aa91724.bae38",
+                "1a40ee60.b28b3a",
+                "beb8db1.da0a8a8",
+                "d321cb9d.153fd8",
+                "ed92ecd.0ad519",
+                "1d19c87b.60a2d",
+                "e7b2dbd5.bd9e",
+                "facd6ff7.1eed9",
+                "f10f9580.1e0308",
+                "e7fac88.832d038",
+                "def45b38.4bd55",
+                "7f309670.a38298",
+                "b80a89b3.da4648",
+                "1781a3e7.247ed4",
+                "69eb61e5.2ebc48"
+            ]
+        ]
+    },
+    {
+        "id": "71fe3c04.e95c14",
+        "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=\"There are no VNFs defined in MD-SAL\" />\n",
+        "comments": "",
+        "x": 966.999927520752,
+        "y": 608.6909036636353,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "f260a284.46dcc",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1006.5963134765625,
-        "y": 661.7630004882812,
-        "z": "565447bf.1f1598",
+        "x": 962.3332977294922,
+        "y": 650.0242853164673,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "988df689.061cb8"
+                "7deaebc4.ac7614"
             ]
         ]
     },
     {
-        "id": "988df689.061cb8",
+        "id": "7deaebc4.ac7614",
         "type": "switchNode",
         "name": "switch service data vnf == input vnf",
         "xml": "<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1257.9296112060547,
-        "y": 661.4297285079956,
-        "z": "565447bf.1f1598",
+        "x": 1213.6665954589844,
+        "y": 649.6910133361816,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c657ad4a.55c47"
+                "51d14b17.854d7c"
             ]
         ]
     },
     {
-        "id": "c657ad4a.55c47",
+        "id": "51d14b17.854d7c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1487.9296226501465,
-        "y": 660.7630414962769,
-        "z": "565447bf.1f1598",
+        "x": 1443.6666069030762,
+        "y": 649.0243263244629,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ae39954d.b28168"
+                "77c2e270.ed179c"
             ]
         ]
     },
     {
-        "id": "9974cb16.902fe8",
+        "id": "b064f8ff.c2b5c",
         "type": "set",
         "name": "set vnf-index to -1",
         "xml": "<set>\n<parameter name='vnf-index' value='-1' />\n",
         "comments": "",
-        "x": 552.9296798706055,
-        "y": 575.4296226501465,
-        "z": "565447bf.1f1598",
+        "x": 508.66666412353516,
+        "y": 563.6909074783325,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "57723ef9.ea31c",
+        "id": "d54d91d7.8b3e78",
         "type": "set",
         "name": "set vnf-index to idx",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1809.5962600708008,
-        "y": 631.7629995346069,
-        "z": "565447bf.1f1598",
+        "x": 1765.3332443237305,
+        "y": 620.024284362793,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "540a131f.3d7bec",
+        "id": "a5f7f097.af8f7",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 541.6797027587891,
-        "y": 727.5963125228882,
-        "z": "565447bf.1f1598",
+        "x": 498.6666717529297,
+        "y": 700.3576040267944,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ca6ccba1.61a798"
+                "be112994.00d4d8"
             ]
         ]
     },
     {
-        "id": "ca6ccba1.61a798",
+        "id": "be112994.00d4d8",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 720.0130882263184,
-        "y": 726.9296884536743,
-        "z": "565447bf.1f1598",
+        "x": 677.000057220459,
+        "y": 699.6909799575806,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "792ace51.b15ed"
+                "470db32f.b4b60c"
             ]
         ]
     },
     {
-        "id": "1c68463e.c02a4a",
+        "id": "470db32f.b4b60c",
+        "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=\"`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`\" />\n",
+        "comments": "",
+        "x": 836.9999656677246,
+        "y": 699.0242834091187,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "32d3cb49.a3ac2c",
         "type": "switchNode",
         "name": "switch vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 559.5964088439941,
-        "y": 1342.0965156555176,
-        "z": "565447bf.1f1598",
+        "x": 515.3333930969238,
+        "y": 1330.3578004837036,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7203a6bd.008058",
-                "1ce0b519.1ca75b"
+                "7ab560e4.1a6d38",
+                "5f6aa735.a00798"
             ]
         ]
     },
     {
-        "id": "7203a6bd.008058",
+        "id": "7ab560e4.1a6d38",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 816.9773635864258,
-        "y": 1309.2392892837524,
-        "z": "565447bf.1f1598",
+        "x": 772.7143478393555,
+        "y": 1297.5005741119385,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1d2df677.49743a"
+                "a613543c.e2cc28"
             ]
         ]
     },
     {
-        "id": "1d2df677.49743a",
+        "id": "a613543c.e2cc28",
         "type": "set",
         "name": "set vf-module-index=0",
         "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",
         "comments": "",
-        "x": 1004.5964012145996,
-        "y": 1309.9060640335083,
-        "z": "565447bf.1f1598",
+        "x": 960.3333854675293,
+        "y": 1298.1673488616943,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "1ce0b519.1ca75b",
+        "id": "5f6aa735.a00798",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 817.4059066772461,
-        "y": 1373.5251474380493,
-        "z": "565447bf.1f1598",
+        "x": 773.1428909301758,
+        "y": 1361.7864322662354,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7b5c967b.5645e8"
+                "b60fe042.ca106"
             ]
         ]
     },
     {
-        "id": "3d0e8775.38d2b8",
+        "id": "da90dded.536778",
         "type": "set",
         "name": "set vf-module-index = vf-module_length",
         "xml": "<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",
         "comments": "",
-        "x": 1202.5964469909668,
-        "y": 1353.715542793274,
-        "z": "565447bf.1f1598",
+        "x": 1158.3334312438965,
+        "y": 1341.97682762146,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "f4745546.3c76c8",
+        "id": "d9bea081.a8647",
         "type": "for",
         "name": "for each existing VF module",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1161.6915397644043,
-        "y": 1397.810772895813,
-        "z": "565447bf.1f1598",
+        "x": 1117.428524017334,
+        "y": 1386.072057723999,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "38be826c.5042de"
+                "1df57378.738945"
             ]
         ]
     },
     {
-        "id": "7b5c967b.5645e8",
+        "id": "b60fe042.ca106",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 954.1201858520508,
-        "y": 1373.5250730514526,
-        "z": "565447bf.1f1598",
+        "x": 909.8571701049805,
+        "y": 1361.7863578796387,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3d0e8775.38d2b8",
-                "f4745546.3c76c8"
+                "da90dded.536778",
+                "d9bea081.a8647"
             ]
         ]
     },
     {
-        "id": "38be826c.5042de",
+        "id": "1df57378.738945",
         "type": "switchNode",
         "name": "switch vf-module-information.vf-module-id == service-data.vnfs.vnf[].vf-modules.vf-module[].vf-module-id",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1665.3106422424316,
-        "y": 1397.3821840286255,
-        "z": "565447bf.1f1598",
+        "x": 1621.0476264953613,
+        "y": 1385.6434688568115,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "5b65413c.247c9"
+                "885ce266.411c5"
             ]
         ]
     },
     {
-        "id": "5b65413c.247c9",
+        "id": "885ce266.411c5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2107.9296913146973,
-        "y": 1396.9536352157593,
-        "z": "565447bf.1f1598",
+        "x": 2063.666675567627,
+        "y": 1385.2149200439453,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cdf91b0.174e5e8"
+                "1d1cc66f.ea78a2"
             ]
         ]
     },
     {
-        "id": "2eae9b0c.edb3d4",
+        "id": "1d1cc66f.ea78a2",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id\n       + ' already exists, and status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",
+        "comments": "",
+        "x": 2215.5715560913086,
+        "y": 1385.2149066925049,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "a40536a4.046de8",
         "type": "comment",
         "name": "make sure this VF module doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1691.7629890441895,
-        "y": 1352.0096759796143,
-        "z": "565447bf.1f1598",
+        "x": 1647.4999732971191,
+        "y": 1340.2709608078003,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "135adbdd.c9ef24",
+        "id": "bd2a2adb.54955",
         "type": "set",
         "name": "set new vf-module_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n",
         "comments": "",
-        "x": 570.2629890441895,
-        "y": 1453.0963706970215,
-        "z": "565447bf.1f1598",
+        "x": 525.9999732971191,
+        "y": 1441.3576555252075,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "86ef2c44.55f05",
+        "id": "47c04218.47c91c",
         "type": "set",
         "name": "set vf-module-topology data",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-topology-identifier.vf-module-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='tmp.vf-module-topology.vf-module-topology-identifier.vf-module-name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`' />\n<parameter name='tmp.vf-module-topology.vf-module-topology-identifier.vf-module-type' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-type`' />\n<parameter name='tmp.vf-module-topology.tenant' value='`$vf-module-topology-operation-input.vf-module-request-input.tenant`' />\n<parameter name='tmp.vf-module-topology.aic-cloud-region' value='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`' />\n",
         "comments": "",
-        "x": 576.7630081176758,
-        "y": 1565.596477508545,
-        "z": "565447bf.1f1598",
+        "x": 532.4999923706055,
+        "y": 1553.857762336731,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "77cfe613.fc65c8",
+        "id": "b167e5bd.dfc368",
         "type": "set",
         "name": "set aic-clli",
         "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.aic-clli'\n   value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\n",
         "comments": "",
-        "x": 1337.7152671813965,
-        "y": 1724.8344039916992,
-        "z": "565447bf.1f1598",
+        "x": 1293.4522514343262,
+        "y": 1713.0956888198853,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "e4caf1eb.a8b9f",
+        "id": "5d68b4f6.9bd994",
         "type": "switchNode",
         "name": "switch aic-clli",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 536.7629280090332,
-        "y": 1838.7867441177368,
-        "z": "565447bf.1f1598",
+        "x": 492.4999122619629,
+        "y": 1827.0480289459229,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "81ee85e4.dedbf8"
+                "8b438660.c4b018"
             ]
         ]
     },
     {
-        "id": "81ee85e4.dedbf8",
+        "id": "8b438660.c4b018",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 682.0486183166504,
-        "y": 1838.7868127822876,
-        "z": "565447bf.1f1598",
+        "x": 637.7856025695801,
+        "y": 1827.0480976104736,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ec2aeced.650af"
+                "a98150bd.2afc08"
             ]
         ]
     },
     {
-        "id": "7c9996aa.a5c0f8",
+        "id": "a98150bd.2afc08",
+        "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=\"`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`\" />\n",
+        "comments": "",
+        "x": 784.9284629821777,
+        "y": 1826.6195316314697,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "4cbe79da.e231f8",
         "type": "get-resource",
         "name": "get-resource cloud region",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"cloud-region\" \n\t\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \n\t\t     cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\"\n        pfx='aai.cloud-region' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 575.6201438903809,
-        "y": 1638.9300155639648,
-        "z": "565447bf.1f1598",
+        "x": 531.3571281433105,
+        "y": 1627.1913003921509,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6f3a4d5a.8ebfd4",
-                "9660a46b.1c9ce8"
+                "a77893f2.866208",
+                "54a4425.3eaf1bc"
             ]
         ]
     },
     {
-        "id": "9660a46b.1c9ce8",
+        "id": "54a4425.3eaf1bc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 789.8663368225098,
-        "y": 1657.0808715820312,
-        "z": "565447bf.1f1598",
+        "x": 745.6033210754395,
+        "y": 1645.3421564102173,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7adbe623.7575f8"
+                "ba04d0eb.3dae9"
             ]
         ]
     },
     {
-        "id": "6f3a4d5a.8ebfd4",
+        "id": "ba04d0eb.3dae9",
+        "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 retrieving cloud region from AAI\" />\n",
+        "comments": "",
+        "x": 920.6032943725586,
+        "y": 1645.3421926498413,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "a77893f2.866208",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.7949333190918,
-        "y": 1614.3666048049927,
-        "z": "565447bf.1f1598",
+        "x": 754.5319175720215,
+        "y": 1603.6278896331787,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "799eaa32.6fe824"
+                "234062c6.8fefc6"
             ]
         ]
     },
     {
-        "id": "ae39954d.b28168",
+        "id": "234062c6.8fefc6",
+        "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=\"Cloud region not found in AAI\" />\n",
+        "comments": "",
+        "x": 920.8811950683594,
+        "y": 1602.933466911316,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "77c2e270.ed179c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1636.263084411621,
-        "y": 659.6827402114868,
-        "z": "565447bf.1f1598",
+        "x": 1592.0000686645508,
+        "y": 647.9440250396729,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "57723ef9.ea31c",
-                "c07cd07d.0c75a"
+                "d54d91d7.8b3e78",
+                "bfe3038c.a182"
             ]
         ]
     },
     {
-        "id": "c07cd07d.0c75a",
+        "id": "bfe3038c.a182",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1771.2630500793457,
-        "y": 681.349326133728,
-        "z": "565447bf.1f1598",
+        "x": 1727.0000343322754,
+        "y": 669.6106109619141,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "952256ff.21f9a8",
+        "id": "904b2f3e.415788",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n",
         "comments": "",
-        "x": 951.0962677001953,
-        "y": 1880.1827373504639,
-        "z": "565447bf.1f1598",
+        "x": 906.833251953125,
+        "y": 1868.44402217865,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "e1558384.bfa8e",
+        "id": "2b324bfd.26e0fc",
         "type": "switchNode",
         "name": "switch input model-invariant-uuid",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 594.9533424377441,
-        "y": 1903.0071811676025,
-        "z": "565447bf.1f1598",
+        "x": 550.6903266906738,
+        "y": 1891.2684659957886,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cd2324fc.034808",
-                "38df22f.16dd4de"
+                "385357de.ea8398",
+                "299c303.4cf2ad"
             ]
         ]
     },
     {
-        "id": "cd2324fc.034808",
+        "id": "385357de.ea8398",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 800.6200141906738,
-        "y": 1880.1501445770264,
-        "z": "565447bf.1f1598",
+        "x": 756.3569984436035,
+        "y": 1868.4114294052124,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "952256ff.21f9a8"
+                "904b2f3e.415788"
             ]
         ]
     },
     {
-        "id": "38df22f.16dd4de",
+        "id": "299c303.4cf2ad",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 802.0486106872559,
-        "y": 1924.4357357025146,
-        "z": "565447bf.1f1598",
+        "x": 757.7855949401855,
+        "y": 1912.6970205307007,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cb5b92dd.63cc2"
+                "f7953ce0.dfc7c"
             ]
         ]
     },
     {
-        "id": "cb5b92dd.63cc2",
+        "id": "f7953ce0.dfc7c",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\n",
         "comments": "",
-        "x": 956.3343467712402,
-        "y": 1923.8643078804016,
-        "z": "565447bf.1f1598",
+        "x": 912.0713310241699,
+        "y": 1912.1255927085876,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "9d20a066.9a052",
+        "id": "733eafb4.30c8d",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n",
         "comments": "",
-        "x": 952.0485382080078,
-        "y": 1968.7214136123657,
-        "z": "565447bf.1f1598",
+        "x": 907.7855224609375,
+        "y": 1956.9826984405518,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "b08a4dbf.cf985",
+        "id": "ed77dce7.269d88",
         "type": "switchNode",
         "name": "switch input model-uuid",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.5723609924316,
-        "y": 1991.5459184646606,
-        "z": "565447bf.1f1598",
+        "x": 523.3093452453613,
+        "y": 1979.8072032928467,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c7ed7b53.7dd0f8",
-                "778bc2b7.d82bbc"
+                "9008b525.6a4788",
+                "f3c2a46.0aaa8d8"
             ]
         ]
     },
     {
-        "id": "c7ed7b53.7dd0f8",
+        "id": "9008b525.6a4788",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 801.5723342895508,
-        "y": 1968.688850402832,
-        "z": "565447bf.1f1598",
+        "x": 757.3093185424805,
+        "y": 1956.950135231018,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9d20a066.9a052"
+                "733eafb4.30c8d"
             ]
         ]
     },
     {
-        "id": "778bc2b7.d82bbc",
+        "id": "f3c2a46.0aaa8d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 803.0009307861328,
-        "y": 2012.9744415283203,
-        "z": "565447bf.1f1598",
+        "x": 758.7379150390625,
+        "y": 2001.2357263565063,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f7d52f4a.cdff6"
+                "c4a21df.1175a6"
             ]
         ]
     },
     {
-        "id": "f7d52f4a.cdff6",
+        "id": "c4a21df.1175a6",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\n",
         "comments": "",
-        "x": 957.2866668701172,
-        "y": 2012.4030137062073,
-        "z": "565447bf.1f1598",
+        "x": 913.0236511230469,
+        "y": 2000.6642985343933,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "dac6c331.68c42",
+        "id": "1f38b7fe.ab1b8",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n",
         "comments": "",
-        "x": 949.1914710998535,
-        "y": 2057.5786209106445,
-        "z": "565447bf.1f1598",
+        "x": 904.9284553527832,
+        "y": 2045.8399057388306,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "f888462e.a53c78",
+        "id": "62ca20ce.f4db7",
         "type": "switchNode",
         "name": "switch input model-version",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 575.7152328491211,
-        "y": 2080.4030656814575,
-        "z": "565447bf.1f1598",
+        "x": 531.4522171020508,
+        "y": 2068.6643505096436,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9c31df03.57fb6",
-                "9f5a3e1a.3ae01"
+                "41183df5.95a124",
+                "87e93be5.4c098"
             ]
         ]
     },
     {
-        "id": "9c31df03.57fb6",
+        "id": "41183df5.95a124",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 798.715217590332,
-        "y": 2057.546028137207,
-        "z": "565447bf.1f1598",
+        "x": 754.4522018432617,
+        "y": 2045.807312965393,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dac6c331.68c42"
+                "1f38b7fe.ab1b8"
             ]
         ]
     },
     {
-        "id": "9f5a3e1a.3ae01",
+        "id": "87e93be5.4c098",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.1438140869141,
-        "y": 2101.8316192626953,
-        "z": "565447bf.1f1598",
+        "x": 755.8807983398438,
+        "y": 2090.0929040908813,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "886a096e.cd9ed8"
+                "5cce1634.662ce8"
             ]
         ]
     },
     {
-        "id": "886a096e.cd9ed8",
+        "id": "5cce1634.662ce8",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-version'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`' />\n",
         "comments": "",
-        "x": 954.4295501708984,
-        "y": 2101.2601914405823,
-        "z": "565447bf.1f1598",
+        "x": 910.1665344238281,
+        "y": 2089.5214762687683,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "f162ec13.2ea9e",
+        "id": "c2177442.81abc",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n",
         "comments": "",
-        "x": 949.1914710998535,
-        "y": 2144.7214431762695,
-        "z": "565447bf.1f1598",
+        "x": 904.9284553527832,
+        "y": 2132.9827280044556,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "7293e3b2.a19a7c",
+        "id": "cd265369.c8e4",
         "type": "switchNode",
         "name": "switch input model-name",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 570.7152328491211,
-        "y": 2167.5458879470825,
-        "z": "565447bf.1f1598",
+        "x": 526.4522171020508,
+        "y": 2155.8071727752686,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fec48afa.f578f8",
-                "84aba209.b7386"
+                "68b6f8a8.a68c3",
+                "4f8262ee.1ebcac"
             ]
         ]
     },
     {
-        "id": "fec48afa.f578f8",
+        "id": "68b6f8a8.a68c3",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 798.715217590332,
-        "y": 2144.688850402832,
-        "z": "565447bf.1f1598",
+        "x": 754.4522018432617,
+        "y": 2132.950135231018,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f162ec13.2ea9e"
+                "c2177442.81abc"
             ]
         ]
     },
     {
-        "id": "84aba209.b7386",
+        "id": "4f8262ee.1ebcac",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.1438140869141,
-        "y": 2188.9744415283203,
-        "z": "565447bf.1f1598",
+        "x": 755.8807983398438,
+        "y": 2177.2357263565063,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fef7c2e3.5fc15"
+                "2f3b60e4.144198"
             ]
         ]
     },
     {
-        "id": "fef7c2e3.5fc15",
+        "id": "2f3b60e4.144198",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-name'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`' />\n",
         "comments": "",
-        "x": 954.4295501708984,
-        "y": 2188.4030137062073,
-        "z": "565447bf.1f1598",
+        "x": 910.1665344238281,
+        "y": 2176.6642985343933,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "2a3992a0.134e1e",
+        "id": "4772b1e6.c27368",
         "type": "set",
         "name": "set model-customization-uuid",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-customization-uuid'\n  value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\n",
         "comments": "",
-        "x": 585.1675682067871,
-        "y": 2240.054877281189,
-        "z": "565447bf.1f1598",
+        "x": 540.9045524597168,
+        "y": 2228.316162109375,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "2162f1f4.5f96fe",
+        "id": "533af805.057888",
         "type": "set",
         "name": "set vf-module-id",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'\n   value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n",
         "comments": "",
-        "x": 538.3582153320312,
-        "y": 1508.7780532836914,
-        "z": "565447bf.1f1598",
+        "x": 494.09519958496094,
+        "y": 1497.0393381118774,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "ff74ebeb.c5ffd8",
+        "id": "acb49220.447a5",
         "type": "for",
         "name": "for each cloud-region relationship",
         "xml": "<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 597.8739585876465,
-        "y": 1727.4366989135742,
-        "z": "565447bf.1f1598",
+        "x": 553.6109428405762,
+        "y": 1715.6979837417603,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6dfb70e4.99bce"
+                "59afb518.40828c"
             ]
         ]
     },
     {
-        "id": "6dfb70e4.99bce",
+        "id": "59afb518.40828c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 845.5525016784668,
-        "y": 1727.1866283416748,
-        "z": "565447bf.1f1598",
+        "x": 801.2894859313965,
+        "y": 1715.4479131698608,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8d3e1649.827698"
+                "5978af5d.b1d4a"
             ]
         ]
     },
     {
-        "id": "8d3e1649.827698",
+        "id": "5978af5d.b1d4a",
         "type": "outcome",
         "name": "complex",
         "xml": "<outcome value='complex'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1015.0168228149414,
-        "y": 1726.5794506072998,
-        "z": "565447bf.1f1598",
+        "x": 970.7538070678711,
+        "y": 1714.8407354354858,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "89cc33ca.87336"
+                "7b948c9e.d27a6c"
             ]
         ]
     },
     {
-        "id": "f7308857.ab0638",
+        "id": "2a23b2e8.9b4796",
         "type": "execute",
         "name": "split related-link",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='aai-uid-split' />\n   <parameter name='original_string' value='`$aai.cloud-region.relationship-list.relationship[$idx].related-link`' />\n   <parameter name='regex' value='/' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1355.1119804382324,
-        "y": 1681.0080261230469,
-        "z": "565447bf.1f1598",
+        "x": 1310.848964691162,
+        "y": 1669.269310951233,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "89cc33ca.87336",
+        "id": "7b948c9e.d27a6c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1174.7786827087402,
-        "y": 1727.6748142242432,
-        "z": "565447bf.1f1598",
+        "x": 1130.51566696167,
+        "y": 1715.9360990524292,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f7308857.ab0638",
-                "f22bbebf.cf96a",
-                "77cfe613.fc65c8"
+                "2a23b2e8.9b4796",
+                "d28b8bb2.cca418",
+                "b167e5bd.dfc368"
             ]
         ]
     },
     {
-        "id": "f22bbebf.cf96a",
+        "id": "d28b8bb2.cca418",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1324.7786445617676,
-        "y": 1771.008111000061,
-        "z": "565447bf.1f1598",
+        "x": 1280.5156288146973,
+        "y": 1759.269395828247,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "f4d050b1.8b4c3",
+        "id": "c4f07890.7e2328",
         "type": "execute",
         "name": "execute PropertiesNode",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 575.3106384277344,
-        "y": 198.28682327270508,
-        "z": "565447bf.1f1598",
+        "x": 531.0476226806641,
+        "y": 186.5481081008911,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "24109bc2.4c9eb4",
+        "id": "beb8db1.da0a8a8",
         "type": "set",
         "name": "set order-status to PendingCreate",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
         "comments": "",
-        "x": 480.52525329589844,
-        "y": 7336.643012046814,
-        "z": "565447bf.1f1598",
+        "x": 436.2622375488281,
+        "y": 7324.904296875,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "c7aef34d.6997b",
+        "id": "ed92ecd.0ad519",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 421.52514266967773,
-        "y": 7741.690473556519,
-        "z": "565447bf.1f1598",
+        "x": 375.8335418701172,
+        "y": 7438.522626876831,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "35a859e5.3e7c46",
+        "id": "1a40ee60.b28b3a",
         "type": "set",
         "name": "copy input data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.'\n   value='$vf-module-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.'\n   value='$vf-module-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.'\n   value='$vf-module-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.'\n   value='$vf-module-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.'\n   value='$vf-module-topology-operation-input.vf-module-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.'\n   value='$vf-module-topology-operation-input.vf-module-request-input.' />\n\n",
         "comments": "",
-        "x": 436.38226318359375,
-        "y": 7192.991468846798,
-        "z": "565447bf.1f1598",
+        "x": 392.11924743652344,
+        "y": 7181.252753674984,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "75a8181a.0cae18",
+        "id": "9aa91724.bae38",
         "type": "set",
         "name": "copy vf-module-topology data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.' value='tmp.vf-module-topology.' />\n",
         "comments": "",
-        "x": 481.26326751708984,
-        "y": 7144.776980817318,
-        "z": "565447bf.1f1598",
+        "x": 437.00025177001953,
+        "y": 7133.038265645504,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "59bf9724.469638",
+        "id": "d321cb9d.153fd8",
+        "type": "execute",
+        "name": "printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 370.71449279785156,
+        "y": 7390.752443313599,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "87463151.06bbf8",
         "type": "save",
         "name": "update vf-module",
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vf-module\"\n   key=\"vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id\n      AND generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"vf-module-name\" value=\"`$tmp.vf-module-topology.vf-module-topology-identifier.vf-module-name`\" />\n<parameter name=\"model-invariant-id\" value=\"`$tmp.vf-module-topology.onap-model-information.model-invariant-uuid`\" />\n<parameter name=\"model-version-id\" value=\"`$tmp.vf-module-topology.onap-model-information.model-uuid`\" />\n<parameter name=\"model-customization-id\" value=\"`$tmp.vf-module-topology.onap-model-information.model-customization-uuid`\" />\n<parameter name=\"selflink\" value=\"`$vf-module-object-path`\" />\n<parameter name=\"automated-assignment\" value=\"`$automated-assignment`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 500.4059944152832,
-        "y": 4346.778634667397,
-        "z": "565447bf.1f1598",
+        "x": 456.1429786682129,
+        "y": 4335.039919495583,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d74196bc.6b97c8",
-                "6e6f18d0.9bdfe8"
+                "87a0c83.d4f18b8",
+                "2196c18e.80b246"
             ]
         ]
     },
     {
-        "id": "d74196bc.6b97c8",
+        "id": "e5deac0d.5b71f8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\" />\n",
+        "comments": "",
+        "x": 961.1906547546387,
+        "y": 4369.801350176334,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "87a0c83.d4f18b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 675.4776344299316,
-        "y": 4315.159256577492,
-        "z": "565447bf.1f1598",
+        "x": 631.2146186828613,
+        "y": 4303.420541405678,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7f9d44fc.3db7bc"
+                "c70cad3e.594bf8"
             ]
         ]
     },
     {
-        "id": "6e6f18d0.9bdfe8",
+        "id": "2196c18e.80b246",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 684.0490074157715,
-        "y": 4383.778346598148,
-        "z": "565447bf.1f1598",
+        "x": 639.7859916687012,
+        "y": 4372.039631426334,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "94bb0c2d.81fb6"
+                "1eb8d0e0.ac8f6f"
             ]
         ]
     },
     {
-        "id": "489025cd.dbd3ac",
+        "id": "d82a525d.d6db7",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vf-module in AAI\" />\n",
+        "comments": "",
+        "x": 966.2145729064941,
+        "y": 4321.564098000526,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "7f55025b.b643ec",
         "type": "set",
         "name": "set vf-module-object-path",
         "xml": "<set>\n<parameter name='vf-module-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 524.0728034973145,
-        "y": 4222.302863717079,
-        "z": "565447bf.1f1598",
+        "x": 479.80978775024414,
+        "y": 4210.564148545265,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "fb74751e.022f18",
+        "id": "79853c6f.4b0794",
         "type": "save",
         "name": "save vf-module relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vf-module:relationship-list\"\n   key=\"vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id\n      AND generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1294.096549987793,
-        "y": 5904.931029081345,
-        "z": "565447bf.1f1598",
+        "x": 1249.8335342407227,
+        "y": 5893.192313909531,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6418f89e.efde28",
-                "3c5f7fe1.c5c95"
+                "ac4bfc2f.5cef8",
+                "85becea2.445cd8"
             ]
         ]
     },
     {
-        "id": "6418f89e.efde28",
+        "id": "ac4bfc2f.5cef8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1513.9298934936523,
-        "y": 5875.802773237228,
-        "z": "565447bf.1f1598",
+        "x": 1469.666877746582,
+        "y": 5864.064058065414,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b4477865.f6c3d8"
+                "f57dfbe7.74b008"
             ]
         ]
     },
     {
-        "id": "3c5f7fe1.c5c95",
+        "id": "85becea2.445cd8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522.5014266967773,
-        "y": 5928.421917676926,
-        "z": "565447bf.1f1598",
+        "x": 1478.238410949707,
+        "y": 5916.683202505112,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a8844fc9.d802f"
+                "85b716e7.f0d18"
             ]
         ]
     },
     {
-        "id": "474227b8.b83ae8",
+        "id": "d4f9dca3.c75278",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vf-module relationships in AAI\" />\n",
+        "comments": "",
+        "x": 1804.6670112609863,
+        "y": 5883.873954534531,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "5dbea689.bf65d8",
         "type": "for",
         "name": "for each vm-type",
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.7632751464844,
-        "y": 5670.264581918716,
-        "z": "565447bf.1f1598",
+        "x": 429.50025939941406,
+        "y": 5658.5258667469025,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3890cbf7.238894"
+                "f3590468.ca37a8"
             ]
         ]
     },
     {
-        "id": "28b6a2fd.61312e",
+        "id": "7375d6bd.7dd03",
         "type": "for",
         "name": "for each vm-network",
         "xml": "<for silentFailure='true' index='network-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 870.7632865905762,
-        "y": 6088.93141412735,
-        "z": "565447bf.1f1598",
+        "x": 826.5002708435059,
+        "y": 6077.192698955536,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4bd4ba04.8daa14"
+                "9c50ae11.ecd5d8"
             ]
         ]
     },
     {
-        "id": "1d003263.e8205e",
+        "id": "da118248.b8eea8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No l3-network found in AAI for network ID '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`\" />\n",
+        "comments": "",
+        "x": 1806.5003852844238,
+        "y": 5933.858495473862,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "b96e4724.95afc",
         "type": "for",
         "name": "for each vm-type",
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 448.19181060791016,
-        "y": 7037.310637414455,
-        "z": "565447bf.1f1598",
+        "x": 403.92879486083984,
+        "y": 7025.571922242641,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c9fac662.7812b8"
+                "3aa89432.ca7a1c"
             ]
         ]
     },
     {
-        "id": "c9fac662.7812b8",
+        "id": "3aa89432.ca7a1c",
         "type": "for",
         "name": "for each vm",
         "xml": "<for index='vm-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-count`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 643.1918411254883,
-        "y": 7036.643645226955,
-        "z": "565447bf.1f1598",
+        "x": 598.928825378418,
+        "y": 7024.904930055141,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "207acffa.3abd1"
+                "8a1e25bc.ee0138"
             ]
         ]
     },
     {
-        "id": "138fc2c6.5fd4fd",
+        "id": "f7264697.889458",
         "type": "save",
         "name": "save VIPR_CONFIGURATION",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\nkey=\"INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id, vm_name, cloud_region_id, cloud_owner) VALUES ( $service-data.vnfs.vnf[$vnf-index].vnf-id , $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name , $service-data.service-information.service-instance-id , $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index] , $tmp.vf-module-topology.aic-cloud-region , $prop.cloud-region.cloud-owner )\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1034.858543395996,
-        "y": 7059.311295449734,
-        "z": "565447bf.1f1598",
+        "x": 990.5955276489258,
+        "y": 7047.57258027792,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ad9e155d.1028f8"
+                "ebadf32a.3c0bf"
             ]
         ]
     },
     {
-        "id": "71743690.584d78",
+        "id": "903c2202.9792d",
         "type": "comment",
         "name": "Not a failure",
         "info": "",
         "comments": "",
-        "x": 1554.8584442138672,
-        "y": 7059.311300218105,
-        "z": "565447bf.1f1598",
+        "x": 1510.5954284667969,
+        "y": 7047.572585046291,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "ad9e155d.1028f8",
+        "id": "ebadf32a.3c0bf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1244.858528137207,
-        "y": 7059.311445176601,
-        "z": "565447bf.1f1598",
+        "x": 1200.5955123901367,
+        "y": 7047.572730004787,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2b130462.23f28c"
+                "5ca4a5a3.8a7004"
             ]
         ]
     },
     {
-        "id": "2b130462.23f28c",
+        "id": "5ca4a5a3.8a7004",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.vf-module-topology-operation-assign:REQID\"/>\n<parameter name=\"field3\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Failed to insert VIPR_CONFIGURATION record\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1388.1919708251953,
-        "y": 7059.311283051968,
-        "z": "565447bf.1f1598",
+        "x": 1343.928955078125,
+        "y": 7047.572567880154,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "da21eac5.eb6e48",
+        "id": "d3f1c108.98d52",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1418.1920928955078,
-        "y": 7010.64299672842,
-        "z": "565447bf.1f1598",
+        "x": 1373.9290771484375,
+        "y": 6998.904281556606,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4475a7ad.750578"
+                "cf4b2a0c.51aca"
             ]
         ]
     },
     {
-        "id": "248ddcf1.40e1a4",
+        "id": "2661f5f7.f49d62",
         "type": "comment",
         "name": "Not a failure",
         "info": "",
         "comments": "",
-        "x": 1741.525146484375,
-        "y": 7008.9768189787865,
-        "z": "565447bf.1f1598",
+        "x": 1697.2621307373047,
+        "y": 6997.2381038069725,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "4475a7ad.750578",
+        "id": "cf4b2a0c.51aca",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.vf-module-topology-operation-assign:REQID\"/>\n<parameter name=\"field3\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Failed to insert VIPR_CONFIGURATION record\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1564.1920280456543,
-        "y": 7010.643629968166,
-        "z": "565447bf.1f1598",
+        "x": 1519.929012298584,
+        "y": 6998.904914796352,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "207acffa.3abd1",
+        "id": "8a1e25bc.ee0138",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 811.5252342224121,
-        "y": 7035.643489778042,
-        "z": "565447bf.1f1598",
+        "x": 767.2622184753418,
+        "y": 7023.904774606228,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "23b5f46a.84a14c",
-                "138fc2c6.5fd4fd"
+                "b143aaa7.b261e",
+                "f7264697.889458"
             ]
         ]
     },
     {
-        "id": "23b5f46a.84a14c",
+        "id": "b143aaa7.b261e",
         "type": "delete",
         "name": "delete any pre-existing records in VIPR_CONFIGURATION",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnfs.vnf[$vnf-index].vnf-id\n     AND ecomp_service_instance_id = $service-data.service-information.service-instance-id\n     AND vm_name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index]' >",
         "comments": "",
         "outputs": 1,
-        "x": 1124.8585586547852,
-        "y": 7010.977629601955,
-        "z": "565447bf.1f1598",
+        "x": 1080.5955429077148,
+        "y": 6999.238914430141,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "da21eac5.eb6e48"
+                "d3f1c108.98d52"
             ]
         ]
     },
     {
-        "id": "7f9d44fc.3db7bc",
+        "id": "c70cad3e.594bf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 833.7632026672363,
-        "y": 4314.9299274683,
-        "z": "565447bf.1f1598",
+        "x": 789.500186920166,
+        "y": 4303.191212296486,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "18d43b0c.816ff5",
-                "1254304a.7d8a4"
+                "d82a525d.d6db7",
+                "8a1998a9.fb5c4"
             ]
         ]
     },
     {
-        "id": "94bb0c2d.81fb6",
+        "id": "1eb8d0e0.ac8f6f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 834.7631187438965,
-        "y": 4381.596217691898,
-        "z": "565447bf.1f1598",
+        "x": 790.5001029968262,
+        "y": 4369.857502520084,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d3b91e2a.6658a"
+                "e5deac0d.5b71f8",
+                "8a1998a9.fb5c4"
             ]
         ]
     },
     {
-        "id": "b4477865.f6c3d8",
+        "id": "f57dfbe7.74b008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1682.4298973083496,
-        "y": 5875.597042798996,
-        "z": "565447bf.1f1598",
+        "x": 1638.1668815612793,
+        "y": 5863.858327627182,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a1d9fe5d.0f695",
-                "fc515f97.dc4ef"
+                "d4f9dca3.c75278",
+                "751caeb9.f5faf"
             ]
         ]
     },
     {
-        "id": "a8844fc9.d802f",
+        "id": "85b716e7.f0d18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1677.4298973083496,
-        "y": 5928.596885442734,
-        "z": "565447bf.1f1598",
+        "x": 1633.1668815612793,
+        "y": 5916.85817027092,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "e64793d7.bf627",
-                "fc515f97.dc4ef"
+                "da118248.b8eea8",
+                "751caeb9.f5faf"
             ]
         ]
     },
     {
-        "id": "755e8713.bcc1c8",
+        "id": "9c7304a7.47b438",
         "type": "execute",
         "name": "execute RestApiCallNode - get preload-list",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.controller.url + $prop.restapi.preloadinformation + $vf-module-topology-operation-input.vf-module-request-input.vf-module-name + '/vf-module'`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-preload\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1043.3463745117188,
-        "y": 2452.429780960083,
-        "z": "565447bf.1f1598",
+        "x": 975.3333778381348,
+        "y": 2373.1915349960327,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "68e62acd.729e34",
-                "a47c9360.b9478"
+                "688ed38d.1404a4",
+                "97bc7502.9be918"
             ]
         ]
     },
     {
-        "id": "68e62acd.729e34",
+        "id": "688ed38d.1404a4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1311.6796073913574,
-        "y": 2410.763111114502,
-        "z": "565447bf.1f1598",
+        "x": 1238.6666933695474,
+        "y": 2336.524751345316,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7b583f75.7c5be"
+                "5a744c0f.0a917c"
             ]
         ]
     },
     {
-        "id": "a47c9360.b9478",
+        "id": "97bc7502.9be918",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310.0129623413086,
-        "y": 2485.7632598876953,
-        "z": "565447bf.1f1598",
+        "x": 1241.9999809265137,
+        "y": 2411.5247468948364,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "acc728a8.eedfa8"
+                "432a7e86.1cf1f"
             ]
         ]
     },
     {
-        "id": "7b583f75.7c5be",
+        "id": "5a744c0f.0a917c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1468.346363067627,
-        "y": 2409.0965490341187,
-        "z": "565447bf.1f1598",
+        "x": 1400.333381652832,
+        "y": 2334.8580360412598,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cec2f13d.67a37"
+                "e468489c.39809"
             ]
         ]
     },
     {
-        "id": "acc728a8.eedfa8",
+        "id": "432a7e86.1cf1f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1465.0129699707031,
-        "y": 2485.763101577759,
-        "z": "565447bf.1f1598",
+        "x": 1396.9999885559082,
+        "y": 2411.5245885849,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3983f41d.db452c"
+                "3588e36f.27b7f4"
             ]
         ]
     },
     {
-        "id": "cec2f13d.67a37",
+        "id": "e468489c.39809",
         "type": "switchNode",
         "name": "switch mdsal-preload.response-code",
         "xml": "<switch test='`$mdsal-preload.response-code`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1696.6796646118164,
-        "y": 2409.0965900421143,
-        "z": "565447bf.1f1598",
+        "x": 1628.6666831970215,
+        "y": 2334.8580770492554,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "e8950979.22bb18",
-                "b6c25b1e.892808"
+                "62edebed.7913a4",
+                "37d8f344.138aec"
             ]
         ]
     },
     {
-        "id": "e8950979.22bb18",
+        "id": "62edebed.7913a4",
         "type": "outcome",
         "name": "404 (not found)",
         "xml": "<outcome value='404'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1979.5963668823242,
-        "y": 2363.6796340942383,
-        "z": "565447bf.1f1598",
+        "x": 1880.3334197998047,
+        "y": 2298.191451072693,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1c4c53fe.44b0dc"
+                "eae1dfc6.c9a018"
             ]
         ]
     },
     {
-        "id": "1c4c53fe.44b0dc",
+        "id": "eae1dfc6.c9a018",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-no-preload",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2382.512939453125,
-        "y": 2277.013102531433,
-        "z": "565447bf.1f1598",
+        "x": 2276.9998893737793,
+        "y": 2296.5245790481567,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cc34b72d.383738"
+                "8901225d.847b7"
             ]
         ]
     },
     {
-        "id": "cc34b72d.383738",
+        "id": "8901225d.847b7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2771.2629013061523,
-        "y": 2277.846981048584,
-        "z": "565447bf.1f1598",
+        "x": 2647.0000381469727,
+        "y": 2294.858115196228,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c1b24090.d49b8"
+                "aa023fe5.47b5f8"
             ]
         ]
     },
     {
-        "id": "b6c25b1e.892808",
+        "id": "d0aa2f4d.891c28",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n",
+        "comments": "",
+        "x": 2955.3334159851074,
+        "y": 2326.5248517990112,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "37d8f344.138aec",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1945.8463287353516,
-        "y": 2427.8464183807373,
-        "z": "565447bf.1f1598",
+        "x": 1855.3334999084473,
+        "y": 2354.8579416275024,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d759206d.14388"
+                "e944765.ab28a88"
             ]
         ]
     },
     {
-        "id": "3983f41d.db452c",
+        "id": "bcf4c56.2e632b8",
+        "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 retrieving preload-information\" />\n",
+        "comments": "",
+        "x": 2168.666404724121,
+        "y": 2371.52436542511,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "3588e36f.27b7f4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-preload",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-preload' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1828.3462600708008,
-        "y": 2487.429849624634,
-        "z": "565447bf.1f1598",
+        "x": 1760.3332786560059,
+        "y": 2413.191336631775,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "90d09a92.2d1cc8"
+                "20ee04ba.8175bc"
             ]
         ]
     },
     {
-        "id": "90d09a92.2d1cc8",
+        "id": "20ee04ba.8175bc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2184.0131225585938,
-        "y": 2485.7634677886963,
-        "z": "565447bf.1f1598",
+        "x": 2116.000141143799,
+        "y": 2411.5249547958374,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "76721fa9.6f7a7"
+                "589f1683.8c95c"
             ]
         ]
     },
     {
-        "id": "3890cbf7.238894",
+        "id": "b1df2727.b9c3d",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n",
+        "comments": "",
+        "x": 2424.333393096924,
+        "y": 2433.191849708557,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "f3590468.ca37a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 664.2633438110352,
-        "y": 5671.097816705704,
-        "z": "565447bf.1f1598",
+        "x": 620.0003280639648,
+        "y": 5659.35910153389,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "28b6a2fd.61312e",
-                "eeca3ef7.08f31"
+                "7375d6bd.7dd03",
+                "d5512709.6a25b8"
             ]
         ]
     },
     {
-        "id": "eeca3ef7.08f31",
+        "id": "d5512709.6a25b8",
         "type": "for",
         "name": "for each vnfc",
         "xml": "<for silentFailure='true' index='vnfc-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 915.2633934020996,
-        "y": 4875.763907909393,
-        "z": "565447bf.1f1598",
+        "x": 871.0003776550293,
+        "y": 4864.025192737579,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "59778d60.c86b24"
+                "753035d1.1e8274"
             ]
         ]
     },
     {
-        "id": "9b23e63c.8ba5d8",
+        "id": "ce29a815.f5683",
         "type": "save",
         "name": "save vnfc to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vnfc\" \n\tkey=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\" >\n<parameter name=\"vnfc-name\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`\" />\n<parameter name=\"nfc-naming-code\" value=\"`$tmp.nfc-naming-code`\" />\n<parameter name=\"nfc-function\" value=\"`$tmp.nfc-function`\" />\n<parameter name=\"model-invariant-id\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].invariant-uuid`\" />\n<parameter name=\"model-version-id\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].uuid`\" />\n<parameter name=\"model-customization-id\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].model-customization-uuid`\" />\n<parameter name=\"orchestration-status\" value=\"`PendingCreate`\" />\n<parameter name=\"in-maint\" value=\"true\" />\n<parameter name=\"prov-status\" value=\"`PREPROV`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1641.2634620666504,
-        "y": 4684.097838401794,
-        "z": "565447bf.1f1598",
+        "x": 1597.00044631958,
+        "y": 4672.3591232299805,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8c17d99f.3ce5f8",
-                "b50cee13.b9a08"
+                "b05fd296.8c44d8",
+                "9ce78c9c.21d2e"
             ]
         ]
     },
     {
-        "id": "59778d60.c86b24",
+        "id": "753035d1.1e8274",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1083.596694946289,
-        "y": 4876.430735111237,
-        "z": "565447bf.1f1598",
+        "x": 1039.3336791992188,
+        "y": 4864.692019939423,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2ee1ddb7.3ce5a2",
-                "63a7631.9e7f99c",
-                "e77ee371.ca79f",
-                "a45139cd.c06788",
-                "d5639dcc.50d87",
-                "3291e6ae.85f8ba"
+                "2b20b1ce.c729ce",
+                "d7c01db4.00c9a",
+                "2fb493e6.57a1c4",
+                "8ca3ab85.032598",
+                "805bb33d.dc18f",
+                "57662986.d12c8"
             ]
         ]
     },
     {
-        "id": "8c17d99f.3ce5f8",
+        "id": "b05fd296.8c44d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1832.263500213623,
-        "y": 4636.431172370911,
-        "z": "565447bf.1f1598",
+        "x": 1788.0004844665527,
+        "y": 4624.692457199097,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fc84df82.5bc09"
+                "f1e503ea.34a2d8"
             ]
         ]
     },
     {
-        "id": "fc84df82.5bc09",
+        "id": "d42c0b98.75f36",
+        "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 saving vnfc to AAI\" />\n",
+        "comments": "",
+        "x": 2127.0006370544434,
+        "y": 4658.835712790489,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "f1e503ea.34a2d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1997.4301872253418,
-        "y": 4650.5590056777,
-        "z": "565447bf.1f1598",
+        "x": 1953.1671714782715,
+        "y": 4638.820290505886,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "30bee8c0.434ad8",
-                "1254304a.7d8a4"
+                "d42c0b98.75f36",
+                "6cb8c914.ed3b6"
             ]
         ]
     },
     {
-        "id": "e77ee371.ca79f",
+        "id": "2fb493e6.57a1c4",
         "type": "save",
         "name": "save vnfc relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vnfc:relationship-list\"\n   key=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/generic-vnfs/generic-vnf/' +\n        $vf-module-topology-operation-input.vnf-information.vnf-id`\" />\n    <parameter name=\"relationship-list.relationship[1].related-to\" value=\"vf-module\" />\n    <parameter name=\"relationship-list.relationship[1].related-link\"\n      value=\"`'/aai/v$/network/generic-vnfs/generic-vnf/' +\n        $vf-module-topology-operation-input.vnf-information.vnf-id +\n        '/vf-modules/vf-module/' +\n        $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1308.1679801940918,
-        "y": 4784.717070102692,
-        "z": "565447bf.1f1598",
+        "x": 1263.9049644470215,
+        "y": 4772.978354930878,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b41f1fa4.6a16e",
-                "c5bf9d82.77072"
+                "90db0abc.901b8",
+                "5dbb78a0.db6928"
             ]
         ]
     },
     {
-        "id": "36f8149b.0100dc",
+        "id": "29cef8c8.08702",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vnfc relationships in AAI\" />\n",
+        "comments": "",
+        "x": 1773.904899597168,
+        "y": 4764.64519071579,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "ee073caa.2c8978",
+        "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=\"Not-found error updating vnfc relationships\" />\n",
+        "comments": "",
+        "x": 1769.0718078613281,
+        "y": 4816.296397686005,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "60b5b7f4.1931b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1640.0011711120605,
-        "y": 4758.034694194794,
-        "z": "565447bf.1f1598",
+        "x": 1595.7381553649902,
+        "y": 4746.29597902298,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "17b97fa6.0b332",
-                "1254304a.7d8a4"
+                "29cef8c8.08702",
+                "6cb8c914.ed3b6"
             ]
         ]
     },
     {
-        "id": "138ca4b2.cb534b",
+        "id": "1c2653f1.974004",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1640.0012474060059,
-        "y": 4811.034452915192,
-        "z": "565447bf.1f1598",
+        "x": 1595.7382316589355,
+        "y": 4799.295737743378,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "43b53fc.f18d2c",
-                "1254304a.7d8a4"
+                "ee073caa.2c8978",
+                "6cb8c914.ed3b6"
             ]
         ]
     },
     {
-        "id": "b41f1fa4.6a16e",
+        "id": "90db0abc.901b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1483.168056488037,
-        "y": 4758.050364017487,
-        "z": "565447bf.1f1598",
+        "x": 1438.9050407409668,
+        "y": 4746.311648845673,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "36f8149b.0100dc"
+                "60b5b7f4.1931b"
             ]
         ]
     },
     {
-        "id": "c5bf9d82.77072",
+        "id": "5dbb78a0.db6928",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1491.739589691162,
-        "y": 4810.669508457184,
-        "z": "565447bf.1f1598",
+        "x": 1447.4765739440918,
+        "y": 4798.93079328537,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "138ca4b2.cb534b"
+                "1c2653f1.974004"
             ]
         ]
     },
     {
-        "id": "2ee1ddb7.3ce5a2",
+        "id": "2b20b1ce.c729ce",
         "type": "for",
         "name": "for each vnfc-network-role",
         "xml": "<for silentFailure='true' index='network-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1305.644100189209,
-        "y": 5201.573478221893,
-        "z": "565447bf.1f1598",
+        "x": 1261.3810844421387,
+        "y": 5189.834763050079,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "52bb6b86.aae8d4"
+                "8ef35028.d3c7d8"
             ]
         ]
     },
     {
-        "id": "7ffbcb4d.5fb274",
+        "id": "1d19c87b.60a2d",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmoduleb.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 526.2630043029785,
-        "y": 2509.4773001670837,
-        "z": "565447bf.1f1598",
+        "x": 481.9999885559082,
+        "y": 2497.73858499527,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "3ff39820.94ba88",
+        "id": "c587555a.9764c8",
         "type": "for",
         "name": "for each vnfc-subnetwork-role",
         "xml": "<for silentFailure='true' index='subnet-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1761.59663772583,
-        "y": 5164.763911724091,
-        "z": "565447bf.1f1598",
+        "x": 1717.3336219787598,
+        "y": 5153.025196552277,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "bae62f0f.f599"
+                "646ce656.488b28"
             ]
         ]
     },
     {
-        "id": "bae62f0f.f599",
+        "id": "646ce656.488b28",
         "type": "for",
         "name": "for each vnfc-address-family",
         "xml": "<for silentFailure='true' index='address-family-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2028.9299812316895,
-        "y": 5163.764400005341,
-        "z": "565447bf.1f1598",
+        "x": 1984.6669654846191,
+        "y": 5152.025684833527,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "83b71d8.34202e"
+                "830c0220.91b9c"
             ]
         ]
     },
     {
-        "id": "9893ef44.5c929",
+        "id": "cdc035b3.67e6e8",
         "type": "for",
         "name": "for each vnfc-ip-address",
         "xml": "<for silentFailure='true' index='address-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2460.9295921325684,
-        "y": 5230.430099487305,
-        "z": "565447bf.1f1598",
+        "x": 2416.666576385498,
+        "y": 5218.691384315491,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4955053a.cc8cec"
+                "4ac2f856.4d21a"
             ]
         ]
     },
     {
-        "id": "83b71d8.34202e",
+        "id": "830c0220.91b9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2239.9297523498535,
-        "y": 5163.76385641098,
-        "z": "565447bf.1f1598",
+        "x": 2195.666736602783,
+        "y": 5152.025141239166,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "bd1ac39a.c86f3",
-                "9893ef44.5c929"
+                "dcce10c4.7be118",
+                "cdc035b3.67e6e8"
             ]
         ]
     },
     {
-        "id": "bd1ac39a.c86f3",
+        "id": "dcce10c4.7be118",
         "type": "set",
         "name": "set tmp.address-family",
         "xml": "<set>\n<parameter name='tmp.address-family'\n  value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-address-family`' />\n",
         "comments": "",
-        "x": 2459.9300804138184,
-        "y": 5083.763753890991,
-        "z": "565447bf.1f1598",
+        "x": 2415.667064666748,
+        "y": 5072.025038719177,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "4955053a.cc8cec",
+        "id": "4ac2f856.4d21a",
         "type": "switchNode",
         "name": "switch address family",
         "xml": "<switch test='`$tmp.address-family`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2699.9296836853027,
-        "y": 5228.763921737671,
-        "z": "565447bf.1f1598",
+        "x": 2655.6666679382324,
+        "y": 5217.025206565857,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "df6d826a.602a2",
-                "b4544053.188e9"
+                "d2b5d9a8.4fd5e8",
+                "24a90faa.98e37"
             ]
         ]
     },
     {
-        "id": "df6d826a.602a2",
+        "id": "d2b5d9a8.4fd5e8",
         "type": "outcome",
         "name": "ipv4",
         "xml": "<outcome value='ipv4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2897.0726890563965,
-        "y": 5132.335182189941,
-        "z": "565447bf.1f1598",
+        "x": 2852.809673309326,
+        "y": 5120.596467018127,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "78841d68.5129e4"
+                "422e7141.76707"
             ]
         ]
     },
     {
-        "id": "b4544053.188e9",
+        "id": "24a90faa.98e37",
         "type": "outcome",
         "name": "ipv6",
         "xml": "<outcome value='ipv6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2894.6917610168457,
-        "y": 5312.097213745117,
-        "z": "565447bf.1f1598",
+        "x": 2850.4287452697754,
+        "y": 5300.358498573303,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "133e1aca.140a05"
+                "644b913f.522e68"
             ]
         ]
     },
     {
-        "id": "82d4dce2.8069",
+        "id": "63f4b67.4ec08c8",
         "type": "comment",
         "name": "Fixed IPs",
         "info": "",
         "comments": "",
-        "x": 1778.5966529846191,
-        "y": 5126.431288719177,
-        "z": "565447bf.1f1598",
+        "x": 1734.3336372375488,
+        "y": 5114.692573547363,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "ae224e40.c6874",
+        "id": "1637640f.3b1ca4",
         "type": "save",
         "name": "save l3-interface-ipv4-address-list object to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-interface-ipv4-address-list\" \n\tkey=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n\t  AND cp.cp-instance-id = $cp-instance-id\n\t  AND l3-interface-ipv4-address-list.l3-interface-ipv4-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[$address-index].vnfc-ip-address\" >\n<parameter name=\"l3-interface-ipv4-address\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[$address-index].vnfc-ip-address`\" />\n<parameter name=\"l3-interface-ipv4-prefix-length\" value=\"32\" />\n<parameter name=\"is-floating\" value=\"false\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3340.405818939209,
-        "y": 5080.668262163799,
-        "z": "565447bf.1f1598",
+        "x": 3296.1428031921387,
+        "y": 5068.929546991985,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "929637d6.457068"
+                "516f7849.a1f358"
             ]
         ]
     },
     {
-        "id": "78841d68.5129e4",
+        "id": "422e7141.76707",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3047.0726890563965,
-        "y": 5132.335100809734,
-        "z": "565447bf.1f1598",
+        "x": 3002.809673309326,
+        "y": 5120.59638563792,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ae224e40.c6874",
-                "8bea43e3.8116"
+                "1637640f.3b1ca4",
+                "d964b923.e557d"
             ]
         ]
     },
     {
-        "id": "36922023.99beb",
+        "id": "29157e1f.b307d2",
+        "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 creating l3-interface-ipv4-address-list object in AAI\" />\n",
+        "comments": "",
+        "x": 3879.4763221740723,
+        "y": 5087.263206164043,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "8892b8a2.cfbe48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3753.905693054199,
-        "y": 5080.65275446574,
-        "z": "565447bf.1f1598",
+        "x": 3709.642677307129,
+        "y": 5068.914039293926,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cc682bd5.2eb5c8",
-                "11d81f8a.7859d"
+                "29157e1f.b307d2",
+                "ab19f58c.bd384"
             ]
         ]
     },
     {
-        "id": "929637d6.457068",
+        "id": "516f7849.a1f358",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3597.072578430176,
-        "y": 5080.668424288433,
-        "z": "565447bf.1f1598",
+        "x": 3552.8095626831055,
+        "y": 5068.929709116619,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "36922023.99beb"
+                "8892b8a2.cfbe48"
             ]
         ]
     },
     {
-        "id": "8bea43e3.8116",
+        "id": "d964b923.e557d",
         "type": "save",
         "name": "save l3-interface-ipv4-address-list relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"l3-interface-ipv4-address-list:relationship-list\"\n   key=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n\t  AND cp.cp-instance-id = $cp-instance-id\n\t  AND l3-interface-ipv4-address-list.l3-interface-ipv4-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[$address-index].vnfc-ip-address\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].network-id`\" />\n    <parameter name=\"relationship-list.relationship[1].related-to\" value=\"subnet\" />\n    <parameter name=\"relationship-list.relationship[1].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].network-id +\n        '/subnets/subnet/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3335.406063079834,
-        "y": 5179.00168100993,
-        "z": "565447bf.1f1598",
+        "x": 3291.1430473327637,
+        "y": 5167.262965838116,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2e1bef20.bf0fd",
-                "5d3ca55b.b0a96c"
+                "8ae58a30.bea5e",
+                "c00d26fd.0b7fa8"
             ]
         ]
     },
     {
-        "id": "aa9b6876.841938",
+        "id": "a4c2dc75.a86138",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv4-address-list relationships in AAI\" />\n",
+        "comments": "",
+        "x": 3877.809429168701,
+        "y": 5158.929637591045,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "623384cf.019e64",
+        "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=\"Not-found error updating l3-interface-ipv4-address-list relationships\" />\n",
+        "comments": "",
+        "x": 3877.976291656494,
+        "y": 5208.914095560711,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "c225d55b.e00f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3755.5723152160645,
-        "y": 5150.652725855511,
-        "z": "565447bf.1f1598",
+        "x": 3711.309299468994,
+        "y": 5138.914010683697,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1499e507.42f6db",
-                "11d81f8a.7859d"
+                "a4c2dc75.a86138",
+                "ab19f58c.bd384"
             ]
         ]
     },
     {
-        "id": "670834a7.3d263c",
+        "id": "fa08395c.d3bfd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3755.5723915100098,
-        "y": 5203.652484575909,
-        "z": "565447bf.1f1598",
+        "x": 3711.3093757629395,
+        "y": 5191.913769404095,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dac8db15.74e098",
-                "11d81f8a.7859d"
+                "623384cf.019e64",
+                "ab19f58c.bd384"
             ]
         ]
     },
     {
-        "id": "2e1bef20.bf0fd",
+        "id": "8ae58a30.bea5e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3598.739200592041,
-        "y": 5150.6683956782035,
-        "z": "565447bf.1f1598",
+        "x": 3554.4761848449707,
+        "y": 5138.92968050639,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "aa9b6876.841938"
+                "c225d55b.e00f4"
             ]
         ]
     },
     {
-        "id": "5d3ca55b.b0a96c",
+        "id": "c00d26fd.0b7fa8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3607.310733795166,
-        "y": 5203.287540117901,
-        "z": "565447bf.1f1598",
+        "x": 3563.0477180480957,
+        "y": 5191.548824946087,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "670834a7.3d263c"
+                "fa08395c.d3bfd"
             ]
         ]
     },
     {
-        "id": "f5cbef76.ec89e",
+        "id": "9f97d2b1.490b88",
         "type": "save",
         "name": "save l3-interface-ipv6-address-list object to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"l3-interface-ipv6-address-list\" \n\tkey=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n\t  AND cp.cp-instance-id = $cp-instance-id\n\t  AND l3-interface-ipv6-address-list.l3-interface-ipv6-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[$address-index].vnfc-ip-address\" >\n<parameter name=\"l3-interface-ipv6-address\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[$address-index].vnfc-ip-address`\" />\n<parameter name=\"l3-interface-ipv6-prefix-length\" value=\"128\" />\n<parameter name=\"is-floating\" value=\"false\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3339.2155570983887,
-        "y": 5259.716318130493,
-        "z": "565447bf.1f1598",
+        "x": 3294.9525413513184,
+        "y": 5247.977602958679,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f2553d5e.abe0f"
+                "575beeb7.db0eb8"
             ]
         ]
     },
     {
-        "id": "133e1aca.140a05",
+        "id": "644b913f.522e68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3045.882427215576,
-        "y": 5311.383156776428,
-        "z": "565447bf.1f1598",
+        "x": 3001.619411468506,
+        "y": 5299.644441604614,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f5cbef76.ec89e",
-                "81cd3242.fe0b"
+                "9f97d2b1.490b88",
+                "1c9488a1.dbf7bf"
             ]
         ]
     },
     {
-        "id": "51b65599.0e89cc",
+        "id": "1b3c364b.f4083a",
+        "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 creating l3-interface-ipv6-address-list object in AAI\" />\n",
+        "comments": "",
+        "x": 3878.286060333252,
+        "y": 5266.311262130737,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "55bcda47.670024",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3752.715431213379,
-        "y": 5259.700810432434,
-        "z": "565447bf.1f1598",
+        "x": 3708.4524154663086,
+        "y": 5247.96209526062,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "97323f99.6212d",
-                "11d81f8a.7859d"
+                "1b3c364b.f4083a",
+                "ab19f58c.bd384"
             ]
         ]
     },
     {
-        "id": "f2553d5e.abe0f",
+        "id": "575beeb7.db0eb8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3595.8823165893555,
-        "y": 5259.716480255127,
-        "z": "565447bf.1f1598",
+        "x": 3551.619300842285,
+        "y": 5247.977765083313,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "51b65599.0e89cc"
+                "55bcda47.670024"
             ]
         ]
     },
     {
-        "id": "81cd3242.fe0b",
+        "id": "1c9488a1.dbf7bf",
         "type": "save",
         "name": "save l3-interface-ipv6-address-list relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"l3-interface-ipv6-address-list:relationship-list\"\n   key=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n\t  AND cp.cp-instance-id = $cp-instance-id\n\t  AND l3-interface-ipv6-address-list.l3-interface-ipv6-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[$address-index].vnfc-ip-address\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].network-id`\" />\n    <parameter name=\"relationship-list.relationship[1].related-to\" value=\"subnet\" />\n    <parameter name=\"relationship-list.relationship[1].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].network-id +\n        '/subnets/subnet/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3334.2158012390137,
-        "y": 5358.0497369766235,
-        "z": "565447bf.1f1598",
+        "x": 3289.9527854919434,
+        "y": 5346.31102180481,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cd0e04b7.a88538",
-                "2202ffa2.d2838"
+                "3f5a76d4.d0b6ca",
+                "a74ee1d6.e4ad68"
             ]
         ]
     },
     {
-        "id": "973eecbd.3a12f",
+        "id": "b0e3be9c.c1618",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv6-address-list relationships in AAI\" />\n",
+        "comments": "",
+        "x": 3876.619167327881,
+        "y": 5337.977693557739,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "66075d54.cd658c",
+        "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=\"Not-found error updating l3-interface-ipv6-address-list relationships\" />\n",
+        "comments": "",
+        "x": 3880.1193885803223,
+        "y": 5384.628710031509,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "24ecf111.9044a6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3754.382053375244,
-        "y": 5329.700781822205,
-        "z": "565447bf.1f1598",
+        "x": 3710.119037628174,
+        "y": 5317.962066650391,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2f312957.2b15e6",
-                "11d81f8a.7859d"
+                "b0e3be9c.c1618",
+                "ab19f58c.bd384"
             ]
         ]
     },
     {
-        "id": "41ca4b49.e89434",
+        "id": "1cf894fa.a3757b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3754.3821296691895,
-        "y": 5382.7005405426025,
-        "z": "565447bf.1f1598",
+        "x": 3710.119113922119,
+        "y": 5370.961825370789,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9f878bec.0f8958",
-                "11d81f8a.7859d"
+                "66075d54.cd658c",
+                "ab19f58c.bd384"
             ]
         ]
     },
     {
-        "id": "cd0e04b7.a88538",
+        "id": "3f5a76d4.d0b6ca",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3597.5489387512207,
-        "y": 5329.7164516448975,
-        "z": "565447bf.1f1598",
+        "x": 3553.2859230041504,
+        "y": 5317.9777364730835,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "973eecbd.3a12f"
+                "24ecf111.9044a6"
             ]
         ]
     },
     {
-        "id": "2202ffa2.d2838",
+        "id": "a74ee1d6.e4ad68",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3606.1204719543457,
-        "y": 5382.335596084595,
-        "z": "565447bf.1f1598",
+        "x": 3561.8574562072754,
+        "y": 5370.596880912781,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "41ca4b49.e89434"
+                "1cf894fa.a3757b"
             ]
         ]
     },
     {
-        "id": "4bd4ba04.8daa14",
+        "id": "9c50ae11.ecd5d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1060.596607208252,
-        "y": 6088.430853366852,
-        "z": "565447bf.1f1598",
+        "x": 1016.3335914611816,
+        "y": 6076.692138195038,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "39f74881.371fb8",
-                "fb74751e.022f18",
-                "12eb0afe.678335",
-                "43f00c8e.4c60b4"
+                "f765dfab.5a8ab8",
+                "79853c6f.4b0794",
+                "7d3563ad.bafe6c",
+                "eb32fc41.713248"
             ]
         ]
     },
     {
-        "id": "d2a87a71.553fc8",
+        "id": "be8fcb49.a0ce6",
         "type": "for",
         "name": "for each vnfc",
         "xml": "<for silentFailure='true' index='vnfc-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1708.5967826843262,
-        "y": 6210.764601230621,
-        "z": "565447bf.1f1598",
+        "x": 1664.3337669372559,
+        "y": 6199.025886058807,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "316d52f.75519ae"
+                "bc8c9230.4f5cf8"
             ]
         ]
     },
     {
-        "id": "9dd5477e.b61ec8",
+        "id": "18f68602.60a112",
         "type": "save",
         "name": "save vip-ipv4-address-list object to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vip-ipv4-address-list\" \n\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner\n\t  AND cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\n\t  AND vip-ipv4-address-list.vip-ipv4-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v4[$ipv4-index]\" >\n<parameter name=\"vip-ipv4-address\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v4[$ipv4-index]`\" />\n<parameter name=\"vip-ipv4-prefix-length\" value=\"32\" />\n<parameter name=\"is-floating\" value=\"false\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1791.59663772583,
-        "y": 6042.097612857819,
-        "z": "565447bf.1f1598",
+        "x": 1747.3336219787598,
+        "y": 6030.358897686005,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "5a0f98fa.d60308",
-                "17b6d486.2926eb"
+                "15b4c37c.7ee625",
+                "f6385911.c3478"
             ]
         ]
     },
     {
-        "id": "12eb0afe.678335",
+        "id": "7d3563ad.bafe6c",
         "type": "for",
         "name": "for each floating ipv4 address",
         "xml": "<for silentFailure='true' index='ipv4-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v4_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1299.5966300964355,
-        "y": 6100.097685337067,
-        "z": "565447bf.1f1598",
+        "x": 1255.3336143493652,
+        "y": 6088.358970165253,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "686b5e11.422ff"
+                "643639b2.a807b8"
             ]
         ]
     },
     {
-        "id": "686b5e11.422ff",
+        "id": "643639b2.a807b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1525.5966300964355,
-        "y": 6098.097685337067,
-        "z": "565447bf.1f1598",
+        "x": 1481.3336143493652,
+        "y": 6086.358970165253,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9dd5477e.b61ec8",
-                "9094ce2c.0f237",
-                "d2a87a71.553fc8"
+                "18f68602.60a112",
+                "79481073.dabf6",
+                "be8fcb49.a0ce6"
             ]
         ]
     },
     {
-        "id": "aefdf6d5.094438",
+        "id": "4f4eea49.69364c",
+        "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 saving vip-ipv4-address-list in AAI\" />\n",
+        "comments": "",
+        "x": 2309.3336219787598,
+        "y": 6020.358897686005,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "87cb782b.0a68b8",
+        "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=\"Not-found error saving vip-ipv4-address-list\" />\n",
+        "comments": "",
+        "x": 2309.5004844665527,
+        "y": 6070.34335565567,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "1002735d.48782d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2187.096508026123,
-        "y": 6012.08198595047,
-        "z": "565447bf.1f1598",
+        "x": 2142.8334922790527,
+        "y": 6000.343270778656,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d7673076.3ac06",
-                "fc515f97.dc4ef"
+                "4f4eea49.69364c",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "8aa6fe69.46205",
+        "id": "9394e2e6.c9ed4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2187.0965843200684,
-        "y": 6065.081744670868,
-        "z": "565447bf.1f1598",
+        "x": 2142.833568572998,
+        "y": 6053.343029499054,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "34a07ec7.5c1d72",
-                "fc515f97.dc4ef"
+                "87cb782b.0a68b8",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "5a0f98fa.d60308",
+        "id": "15b4c37c.7ee625",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2030.2633934020996,
-        "y": 6012.097655773163,
-        "z": "565447bf.1f1598",
+        "x": 1986.0003776550293,
+        "y": 6000.358940601349,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "aefdf6d5.094438"
+                "1002735d.48782d"
             ]
         ]
     },
     {
-        "id": "17b6d486.2926eb",
+        "id": "f6385911.c3478",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2038.8349266052246,
-        "y": 6064.71680021286,
-        "z": "565447bf.1f1598",
+        "x": 1994.5719108581543,
+        "y": 6052.978085041046,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8aa6fe69.46205"
+                "9394e2e6.c9ed4"
             ]
         ]
     },
     {
-        "id": "c0647bff.dcfb98",
+        "id": "1f81499d.5e5af6",
         "type": "save",
         "name": "save vip-ipv4-address-list relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vip-ipv4-address-list:relationship-list\"\n   key=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner\n\t  AND cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\n\t  AND vip-ipv4-address-list.vip-ipv4-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v4[$ipv4-index]\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"subnet\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].network-id\n        + '/subnets/subnet/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.ipv4-subnet-id`\" />\n    <parameter name=\"relationship-list.relationship[1].related-to\" value=\"vnfc\" />\n    <parameter name=\"relationship-list.relationship[1].related-link\"\n      value=\"`'/aai/v$/network/vnfcs/vnfc/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2127.2632331848145,
-        "y": 6154.764276027679,
-        "z": "565447bf.1f1598",
+        "x": 2083.000217437744,
+        "y": 6143.0255608558655,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f0cfd83.86b5328",
-                "f315ed94.7bfc9"
+                "9402f7a2.c004f8",
+                "43ffb8db.dfd838"
             ]
         ]
     },
     {
-        "id": "fd3e62f.a29bea",
+        "id": "a145395d.8e9c88",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationships in AAI\" />\n",
+        "comments": "",
+        "x": 2652.6666259765625,
+        "y": 6135.025530397892,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "f29625da.c7a2a",
+        "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=\"Not-found error updating vip-ipv4-address-list relationships\" />\n",
+        "comments": "",
+        "x": 2652.833595275879,
+        "y": 6185.009704113007,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "3507458.c6c0fba",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2530.429512023926,
-        "y": 6126.748618662357,
-        "z": "565447bf.1f1598",
+        "x": 2486.1664962768555,
+        "y": 6115.009903490543,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "38cb90b2.4e39c",
-                "fc515f97.dc4ef"
+                "a145395d.8e9c88",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "5997fd18.c16ad4",
+        "id": "2bfcdbd8.b2861c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2530.429588317871,
-        "y": 6179.748377382755,
-        "z": "565447bf.1f1598",
+        "x": 2486.166572570801,
+        "y": 6168.009662210941,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8d6accf1.493c8",
-                "fc515f97.dc4ef"
+                "f29625da.c7a2a",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "f0cfd83.86b5328",
+        "id": "9402f7a2.c004f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2373.5963973999023,
-        "y": 6126.76428848505,
-        "z": "565447bf.1f1598",
+        "x": 2329.333381652832,
+        "y": 6115.025573313236,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fd3e62f.a29bea"
+                "3507458.c6c0fba"
             ]
         ]
     },
     {
-        "id": "f315ed94.7bfc9",
+        "id": "43ffb8db.dfd838",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2382.1679306030273,
-        "y": 6179.3834329247475,
-        "z": "565447bf.1f1598",
+        "x": 2337.904914855957,
+        "y": 6167.6447177529335,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "5997fd18.c16ad4"
+                "2bfcdbd8.b2861c"
             ]
         ]
     },
     {
-        "id": "783e4357.c986ec",
+        "id": "5f93b476.1dc79c",
         "type": "save",
         "name": "save vip-ipv6-address-list object to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vip-ipv6-address-list\" \n\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner\n\t  AND cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\n\t  AND vip-ipv6-address-list.vip-ipv6-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v6[$ipv6-index]\" >\n<parameter name=\"vip-ipv6-address\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v6[$ipv6-index]`\" />\n<parameter name=\"vip-ipv6-prefix-length\" value=\"128\" />\n<parameter name=\"is-floating\" value=\"false\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1794.9299659729004,
-        "y": 6365.430296421051,
-        "z": "565447bf.1f1598",
+        "x": 1750.66695022583,
+        "y": 6353.691581249237,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1d38b1dd.61e89e",
-                "6176025c.2ad73c"
+                "67236f18.227f98",
+                "c2a53df.84d114"
             ]
         ]
     },
     {
-        "id": "43f00c8e.4c60b4",
+        "id": "eb32fc41.713248",
         "type": "for",
         "name": "for each floating ipv6 address",
         "xml": "<for silentFailure='true' index='ipv6-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v6_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302.9299583435059,
-        "y": 6422.430368900299,
-        "z": "565447bf.1f1598",
+        "x": 1258.6669425964355,
+        "y": 6410.691653728485,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "299ac4c9.b765dc"
+                "78198d85.1f46bc"
             ]
         ]
     },
     {
-        "id": "299ac4c9.b765dc",
+        "id": "78198d85.1f46bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1528.9299583435059,
-        "y": 6421.430368900299,
-        "z": "565447bf.1f1598",
+        "x": 1484.6669425964355,
+        "y": 6409.691653728485,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "783e4357.c986ec",
-                "3d0b5fc0.1aec4",
-                "1976134f.84b09d"
+                "5f93b476.1dc79c",
+                "cde033d4.f6fd",
+                "b51d7c07.17b7c"
             ]
         ]
     },
     {
-        "id": "9dec848e.b51528",
+        "id": "6d658b88.2e8a3c",
+        "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 saving vip-ipv6-address-list in AAI\" />\n",
+        "comments": "",
+        "x": 2312.66695022583,
+        "y": 6343.691581249237,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "3a7db074.96feb8",
+        "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=\"Not-found error saving vip-ipv6-address-list\" />\n",
+        "comments": "",
+        "x": 2312.833812713623,
+        "y": 6393.676039218903,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "7b77c41a.48512c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2190.4298362731934,
-        "y": 6335.414669513702,
-        "z": "565447bf.1f1598",
+        "x": 2146.166820526123,
+        "y": 6323.675954341888,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ec585839.cf03a8",
-                "fc515f97.dc4ef"
+                "6d658b88.2e8a3c",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "cc9a9082.df9ad",
+        "id": "fb34c0be.1fb228",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2190.4299125671387,
-        "y": 6388.4144282341,
-        "z": "565447bf.1f1598",
+        "x": 2146.1668968200684,
+        "y": 6376.675713062286,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dc08e935.aa2128",
-                "fc515f97.dc4ef"
+                "3a7db074.96feb8",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "1d38b1dd.61e89e",
+        "id": "67236f18.227f98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2033.59672164917,
-        "y": 6335.430339336395,
-        "z": "565447bf.1f1598",
+        "x": 1989.3337059020996,
+        "y": 6323.691624164581,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9dec848e.b51528"
+                "7b77c41a.48512c"
             ]
         ]
     },
     {
-        "id": "6176025c.2ad73c",
+        "id": "c2a53df.84d114",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2042.168254852295,
-        "y": 6388.0494837760925,
-        "z": "565447bf.1f1598",
+        "x": 1997.9052391052246,
+        "y": 6376.310768604279,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cc9a9082.df9ad"
+                "fb34c0be.1fb228"
             ]
         ]
     },
     {
-        "id": "82969649.e96bb8",
+        "id": "31f35206.0f932e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv6-address-list relationships in AAI\" />\n",
+        "comments": "",
+        "x": 2646.0002059936523,
+        "y": 6456.6916318535805,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "132ba90c.08b887",
+        "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=\"Not-found error updating vip-ipv6-address-list relationships\" />\n",
+        "comments": "",
+        "x": 2646.1670684814453,
+        "y": 6506.676089823246,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "de40c9e6.508858",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2523.7630920410156,
-        "y": 6448.414720118046,
-        "z": "565447bf.1f1598",
+        "x": 2479.5000762939453,
+        "y": 6436.676004946232,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9303413c.a15fb",
-                "fc515f97.dc4ef"
+                "31f35206.0f932e",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "a4127791.07e268",
+        "id": "44d321f1.eca488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2523.763168334961,
-        "y": 6501.414478838444,
-        "z": "565447bf.1f1598",
+        "x": 2479.5001525878906,
+        "y": 6489.67576366663,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "41362899.a075b8",
-                "fc515f97.dc4ef"
+                "132ba90c.08b887",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "79c39cc4.e386e4",
+        "id": "535c2132.4b5b3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2366.929977416992,
-        "y": 6448.430389940739,
-        "z": "565447bf.1f1598",
+        "x": 2322.666961669922,
+        "y": 6436.691674768925,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "82969649.e96bb8"
+                "de40c9e6.508858"
             ]
         ]
     },
     {
-        "id": "a282925a.d9e0c",
+        "id": "8380291.86ec7d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2375.501510620117,
-        "y": 6501.049534380436,
-        "z": "565447bf.1f1598",
+        "x": 2331.238494873047,
+        "y": 6489.310819208622,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a4127791.07e268"
+                "44d321f1.eca488"
             ]
         ]
     },
     {
-        "id": "bdb5121f.d0648",
+        "id": "47c03850.21f5a",
         "type": "save",
         "name": "save vip-ipv6-address-list relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vip-ipv6-address-list:relationship-list\"\n   key=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner\n\t  AND cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\n\t  AND vip-ipv6-address-list.vip-ipv6-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v6[$ipv6-index]\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"subnet\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].network-id\n        + '/subnets/subnet/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.ipv6-subnet-id`\" />\n    <parameter name=\"relationship-list.relationship[1].related-to\" value=\"vnfc\" />\n    <parameter name=\"relationship-list.relationship[1].related-link\"\n      value=\"`'/aai/v$/network/vnfcs/vnfc/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2122.596820831299,
-        "y": 6477.09680891037,
-        "z": "565447bf.1f1598",
+        "x": 2078.3338050842285,
+        "y": 6465.358093738556,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "79c39cc4.e386e4",
-                "a282925a.d9e0c"
+                "535c2132.4b5b3",
+                "8380291.86ec7d8"
             ]
         ]
     },
     {
-        "id": "63a7631.9e7f99c",
+        "id": "8a1998a9.fb5c4",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1134.3334770202637,
+        "y": 4273.691486895084,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6cb8c914.ed3b6",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2299.0004234313965,
+        "y": 4611.692221999168,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "751caeb9.f5faf",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007.6670036315918,
+        "y": 5828.6920592188835,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7d8d801d.5aba58",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2956.667133331299,
+        "y": 5947.691905498505,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ab19f58c.bd384",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4276.0001220703125,
+        "y": 4995.357985436916,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d7c01db4.00c9a",
         "type": "set",
         "name": "set created_flag",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].created_flag' value='true' />\n",
         "comments": "",
-        "x": 1285.2632637023926,
-        "y": 4724.430592954159,
-        "z": "565447bf.1f1598",
+        "x": 1241.0002479553223,
+        "y": 4712.691877782345,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "39f74881.371fb8",
+        "id": "f765dfab.5a8ab8",
         "type": "set",
         "name": "set created-flag",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].created-flag' value='true' />\n",
         "comments": "",
-        "x": 1255.930019378662,
-        "y": 5972.4307743906975,
-        "z": "565447bf.1f1598",
+        "x": 1211.6670036315918,
+        "y": 5960.6920592188835,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "9094ce2c.0f237",
+        "id": "79481073.dabf6",
         "type": "set",
         "name": "set created-ipv4-flag",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.created-ipv4-flag' value='true' />\n",
         "comments": "",
-        "x": 1728.9299850463867,
-        "y": 6100.4308542609215,
-        "z": "565447bf.1f1598",
+        "x": 1684.6669692993164,
+        "y": 6088.6921390891075,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "3d0b5fc0.1aec4",
+        "id": "cde033d4.f6fd",
         "type": "set",
         "name": "set created-ipv6-flag",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.created-ipv6-flag' value='true' />\n",
         "comments": "",
-        "x": 1734.2633209228516,
-        "y": 6426.430457532406,
-        "z": "565447bf.1f1598",
+        "x": 1690.0003051757812,
+        "y": 6414.691742360592,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "b50cee13.b9a08",
+        "id": "9ce78c9c.21d2e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1835.2634391784668,
-        "y": 4684.430831849575,
-        "z": "565447bf.1f1598",
+        "x": 1791.0004234313965,
+        "y": 4672.692116677761,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fc84df82.5bc09"
+                "f1e503ea.34a2d8"
             ]
         ]
     },
     {
-        "id": "779079fc.7d1618",
+        "id": "e7b2dbd5.bd9e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-vlan-tagging-assign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 618.9297981262207,
-        "y": 6764.430634975433,
-        "z": "565447bf.1f1598",
+        "x": 574.6667823791504,
+        "y": 6752.691919803619,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9bf7c5a4.dd9598"
+                "acea42fa.fe209"
             ]
         ]
     },
     {
-        "id": "9bf7c5a4.dd9598",
+        "id": "acea42fa.fe209",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 963.2632141113281,
-        "y": 6763.764130115509,
-        "z": "565447bf.1f1598",
+        "x": 919.0001983642578,
+        "y": 6752.025414943695,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "471e8c34.437354"
+                "bb8b3ecf.0d4b8"
             ]
         ]
     },
     {
-        "id": "471e8c34.437354",
+        "id": "bb8b3ecf.0d4b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1118.2630882263184,
-        "y": 6763.763926029205,
-        "z": "565447bf.1f1598",
+        "x": 1074.000072479248,
+        "y": 6752.025210857391,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3ca8387c.2993a8",
-                "ddd8fcd8.b0fa8"
+                "8d4ed162.86b8b8",
+                "277ec139.1f8766",
+                "4bc02c78.2ff744"
             ]
         ]
     },
     {
-        "id": "3ca8387c.2993a8",
+        "id": "8d4ed162.86b8b8",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1422.3333625793457,
+        "y": 6697.025630712509,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "277ec139.1f8766",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n",
+        "comments": "",
+        "x": 1250.6668014526367,
+        "y": 6795.358858704567,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "4bc02c78.2ff744",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vlantaggingfailure.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1299.0367050170898,
-        "y": 6736.501932144165,
-        "z": "565447bf.1f1598",
+        "x": 1245.6666984558105,
+        "y": 6748.691714763641,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "fb67aa4b.8284f8",
+        "id": "bfee1c79.25f4d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 257.1558837890625,
-        "y": 520.3101568222046,
-        "z": "565447bf.1f1598",
+        "x": 212.8928680419922,
+        "y": 508.5714416503906,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f4d050b1.8b4c3",
-                "5d7e2c45.4ebe34",
-                "48e25fc2.52f7",
-                "9974cb16.902fe8",
-                "9d5245b6.abb4e8",
-                "540a131f.3d7bec",
-                "d0321bc2.4f6358",
-                "348782c.04c017e",
-                "bceb88ad.260758"
+                "c4f07890.7e2328",
+                "5621ecb6.141394",
+                "b13c4350.370938",
+                "b064f8ff.c2b5c",
+                "fe2663d3.ad286",
+                "a5f7f097.af8f7",
+                "498f5a29.9e1ca4",
+                "f0c546c1.be6dc",
+                "40af7b28.67ea64"
             ]
         ]
     },
     {
-        "id": "9926c7ad.248aa8",
+        "id": "b80a89b3.da4648",
         "type": "switchNode",
         "name": "switch from-preload",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.from-preload`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 548.1677284240723,
-        "y": 2575.9059200286865,
-        "z": "565447bf.1f1598",
+        "x": 503.90471267700195,
+        "y": 2564.1672048568726,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9e164e02.d239",
-                "44723a81.45b694"
+                "3b57b841.e4ee",
+                "5c063e0d.485f8"
             ]
         ]
     },
     {
-        "id": "9e164e02.d239",
+        "id": "3b57b841.e4ee",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 720.0724601745605,
-        "y": 2553.286940574646,
-        "z": "565447bf.1f1598",
+        "x": 675.8094444274902,
+        "y": 2541.548225402832,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3590eb8.88aec14"
+                "2b41d2.bfd34e2e"
             ]
         ]
     },
     {
-        "id": "44723a81.45b694",
+        "id": "5c063e0d.485f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.7391128540039,
-        "y": 2598.2867794036865,
-        "z": "565447bf.1f1598",
+        "x": 677.4760971069336,
+        "y": 2586.5480642318726,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9742bfa8.39e3a"
+                "9acd2d4c.7f4f58"
             ]
         ]
     },
     {
-        "id": "3590eb8.88aec14",
+        "id": "2b41d2.bfd34e2e",
         "type": "set",
         "name": "set automated-assignment to true",
         "xml": "<set>\n<parameter name='automated-assignment' value='true' />\n",
         "comments": "",
-        "x": 935.0724449157715,
-        "y": 2551.620111465454,
-        "z": "565447bf.1f1598",
+        "x": 890.8094291687012,
+        "y": 2539.88139629364,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "9742bfa8.39e3a",
+        "id": "9acd2d4c.7f4f58",
         "type": "set",
         "name": "set automated-assignment to false",
         "xml": "<set>\n<parameter name='automated-assignment' value='false' />\n",
         "comments": "",
-        "x": 933.4057655334473,
-        "y": 2596.6200313568115,
-        "z": "565447bf.1f1598",
+        "x": 889.142749786377,
+        "y": 2584.8813161849976,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "1976134f.84b09d",
+        "id": "b51d7c07.17b7c",
         "type": "for",
         "name": "for each vnfc",
         "xml": "<for silentFailure='true' index='vnfc-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1709.69185256958,
-        "y": 6525.310881137848,
-        "z": "565447bf.1f1598",
+        "x": 1665.4288368225098,
+        "y": 6513.572165966034,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "24db1747.589188"
+                "5f97f00c.f2f7a"
             ]
         ]
     },
     {
-        "id": "494a4418.4600ec",
+        "id": "bc7a6a83.8ca178",
+        "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=\"Test return\" />\n",
+        "comments": "",
+        "x": 130.00014877319336,
+        "y": 6993.359684050083,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "facd6ff7.1eed9",
         "type": "for",
         "name": "for each vm-type",
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 526.9298248291016,
-        "y": 3936.096802711487,
-        "z": "565447bf.1f1598",
+        "x": 482.66680908203125,
+        "y": 3924.358087539673,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "edc660aa.aae32"
+                "f42a02f0.2fdc5"
             ]
         ]
     },
     {
-        "id": "edc660aa.aae32",
+        "id": "f42a02f0.2fdc5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 717.4298934936523,
-        "y": 3936.930037498474,
-        "z": "565447bf.1f1598",
+        "x": 673.166877746582,
+        "y": 3925.19132232666,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8a22c1f6.1af97"
+                "f2b8f79a.47d0c8"
             ]
         ]
     },
     {
-        "id": "8a22c1f6.1af97",
+        "id": "f2b8f79a.47d0c8",
         "type": "for",
         "name": "for each vm-network",
         "xml": "<for silentFailure='true' index='network-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 918.9298248291016,
-        "y": 3936.096802711487,
-        "z": "565447bf.1f1598",
+        "x": 874.6668090820312,
+        "y": 3924.358087539673,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a190fe2f.d886f"
+                "74a58a99.78bf9c"
             ]
         ]
     },
     {
-        "id": "a190fe2f.d886f",
+        "id": "74a58a99.78bf9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1108.7631454467773,
-        "y": 3935.5962419509888,
-        "z": "565447bf.1f1598",
+        "x": 1064.500129699707,
+        "y": 3923.857526779175,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "e0f0f785.dc0f38"
+                "d3a7ff95.69fdf"
             ]
         ]
     },
     {
-        "id": "e0f0f785.dc0f38",
+        "id": "d3a7ff95.69fdf",
         "type": "get-resource",
         "name": "get-resource VFC_RELATED_NETWORK_ROLE",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VFC_RELATED_NETWORK_ROLE where vfc_customization_uuid = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].model-customization-uuid\n    and network_role = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role'\n  pfx='db.vnf-related-network-role[]'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398.2631187438965,
-        "y": 3934.096884727478,
-        "z": "565447bf.1f1598",
+        "x": 1354.0001029968262,
+        "y": 3922.358169555664,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fd7f5581.6d4528",
-                "b45e71b2.bc101"
+                "ac281675.6e9ef8",
+                "441cde65.25a5c"
             ]
         ]
     },
     {
-        "id": "fd7f5581.6d4528",
+        "id": "ac281675.6e9ef8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1669.2630577087402,
-        "y": 3838.763586997986,
-        "z": "565447bf.1f1598",
+        "x": 1625.00004196167,
+        "y": 3827.024871826172,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d6d5d78c.a73e18"
+                "21c357a6.90267"
             ]
         ]
     },
     {
-        "id": "d6d5d78c.a73e18",
+        "id": "21c357a6.90267",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1816.4535751342773,
-        "y": 3837.311601638794,
-        "z": "565447bf.1f1598",
+        "x": 1772.190559387207,
+        "y": 3825.57288646698,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6c1ed4b9.5ecf9c",
-                "f394576a.e4e1d8"
+                "3f8cbef4.25bb0a",
+                "77e726f5.a576b8"
             ]
         ]
     },
     {
-        "id": "b45e71b2.bc101",
+        "id": "441cde65.25a5c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1670.0962677001953,
-        "y": 4083.4304666519165,
-        "z": "565447bf.1f1598",
+        "x": 1613.333293914795,
+        "y": 4046.691343307495,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "952ac2a9.fea88"
+                "e7e940b7.17edf"
             ]
         ]
     },
     {
-        "id": "b3ac03af.ef15c",
+        "id": "54eeb4ef.84d784",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2088.4295196533203,
-        "y": 4085.4302225112915,
-        "z": "565447bf.1f1598",
+        "x": 2031.66654586792,
+        "y": 4048.69109916687,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b5a4eea6.72594",
-                "ce6a381b.978038",
-                "1364d6f3.245769",
-                "f6d3df5a.7d52a",
-                "66f94089.96de5",
-                "a6a60ea4.9fb45",
-                "e617263a.f37478",
-                "5c5c0e0.7b249f4"
+                "d075ed57.96e16",
+                "7659ed81.4f2dfc",
+                "c5babea5.d9aba",
+                "e02da5bb.106d78",
+                "33b270a2.44aa78",
+                "f0d8d701.a9fbc8",
+                "1ad9651a.f1635b",
+                "d7d72478.3bd0f"
             ]
         ]
     },
     {
-        "id": "ce6a381b.978038",
+        "id": "3f8cbef4.25bb0a",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VFC_RELATED_NETWORK_ROLE table\" />\n",
+        "comments": "",
+        "x": 1924.3334159851074,
+        "y": 3822.358123779297,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "7659ed81.4f2dfc",
         "type": "for",
         "name": "for each vnf network",
         "xml": "<for silentFailure='true' index='vnf-network-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2270.929698944092,
-        "y": 3927.7634706497192,
-        "z": "565447bf.1f1598",
+        "x": 2226.6666831970215,
+        "y": 3916.0247554779053,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3f61199.ed2ade6"
+                "b92d9cbc.21841"
             ]
         ]
     },
     {
-        "id": "b5a4eea6.72594",
+        "id": "d075ed57.96e16",
         "type": "set",
         "name": "set found-related-network to false",
         "xml": "<set>\n<parameter name='found-related-network' value='false' />\n",
         "comments": "",
-        "x": 2310.929775238037,
-        "y": 3869.4302473068237,
-        "z": "565447bf.1f1598",
+        "x": 2266.666759490967,
+        "y": 3857.6915321350098,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "86eb7e36.9d7f7",
+        "id": "18560cbf.0eb0f3",
         "type": "for",
         "name": "for each related network",
         "xml": "<for silentFailure='true' index='related-network-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].related-networks.related-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2669.929660797119,
-        "y": 3904.4297342300415,
-        "z": "565447bf.1f1598",
+        "x": 2625.666645050049,
+        "y": 3892.6910190582275,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "69287c55.352c84"
+                "2c6cef8.3fa721"
             ]
         ]
     },
     {
-        "id": "3f61199.ed2ade6",
+        "id": "b92d9cbc.21841",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2458.929698944092,
-        "y": 3927.7634706497192,
-        "z": "565447bf.1f1598",
+        "x": 2414.6666831970215,
+        "y": 3916.0247554779053,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "86eb7e36.9d7f7",
-                "456cf44d.c85fac"
+                "18560cbf.0eb0f3",
+                "ff4fdb5d.de766"
             ]
         ]
     },
     {
-        "id": "69287c55.352c84",
+        "id": "2c6cef8.3fa721",
         "type": "switchNode",
         "name": "switch network-role matches",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].related-networks.related-network[$related-network-index].network-role\n  == $db.vnf-related-network-role[$db-related-network-index].related-network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2921.9295768737793,
-        "y": 3904.429810523987,
-        "z": "565447bf.1f1598",
+        "x": 2877.666561126709,
+        "y": 3892.691095352173,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "875934e4.a63818"
+                "16df1c3d.121c74"
             ]
         ]
     },
     {
-        "id": "952ac2a9.fea88",
+        "id": "e7e940b7.17edf",
         "type": "for",
         "name": "for each db related-network",
         "xml": "<for index='db-related-network-index' start='0' end='`$db.vnf-related-network-role_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1874.4296417236328,
-        "y": 4084.0972146987915,
-        "z": "565447bf.1f1598",
+        "x": 1817.6666679382324,
+        "y": 4047.35809135437,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b3ac03af.ef15c"
+                "54eeb4ef.84d784"
             ]
         ]
     },
     {
-        "id": "875934e4.a63818",
+        "id": "678d4c53.0bb2dc",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 298.6669120788574,
+        "y": 6953.359684050083,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "16df1c3d.121c74",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3121.9295768737793,
-        "y": 3902.429810523987,
-        "z": "565447bf.1f1598",
+        "x": 3077.666561126709,
+        "y": 3890.691095352173,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "5d83fcee.a618a4"
+                "b6af3325.d14fe"
             ]
         ]
     },
     {
-        "id": "5d83fcee.a618a4",
+        "id": "b6af3325.d14fe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3275.9295768737793,
-        "y": 3900.429810523987,
-        "z": "565447bf.1f1598",
+        "x": 3231.666561126709,
+        "y": 3888.691095352173,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4df768f6.bb1e68",
-                "f4645e05.09dbf",
-                "29f5561c.96eb2a"
+                "7ea20a1d.7dcac4",
+                "34e3568a.1d1aca",
+                "3d29969a.2c72ea"
             ]
         ]
     },
     {
-        "id": "4df768f6.bb1e68",
+        "id": "7ea20a1d.7dcac4",
         "type": "set",
         "name": "set found-related-network to true",
         "xml": "<set>\n<parameter name='found-related-network' value='true' />\n",
         "comments": "",
-        "x": 3507.9297370910645,
-        "y": 3860.0963945388794,
-        "z": "565447bf.1f1598",
+        "x": 3463.666721343994,
+        "y": 3848.3576793670654,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "f4645e05.09dbf",
+        "id": "34e3568a.1d1aca",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3431.262912750244,
-        "y": 3946.763144493103,
-        "z": "565447bf.1f1598",
+        "x": 3386.999897003174,
+        "y": 3935.024429321289,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "1364d6f3.245769",
+        "id": "c5babea5.d9aba",
         "type": "switchNode",
         "name": "switch found-related-network",
         "xml": "<switch test='`$found-related-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2306.429588317871,
-        "y": 4028.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2249.6666145324707,
+        "y": 3991.6912326812744,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "19517216.b897fe"
+                "d92d1f7b.311be"
             ]
         ]
     },
     {
-        "id": "19517216.b897fe",
+        "id": "d92d1f7b.311be",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2500.429588317871,
-        "y": 4026.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2443.6666145324707,
+        "y": 3989.6912326812744,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f7f125ed.69c228"
+                "4c319279.354754"
             ]
         ]
     },
     {
-        "id": "f7f125ed.69c228",
+        "id": "5fe8d8f9.449b28",
+        "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=\"`'Unable to find related network '\n      + $db.vnf-related-network-role[$db-related-network-index].related-network-role + ' in vnf-networks'`\" />\n",
+        "comments": "",
+        "x": 2721.6666145324707,
+        "y": 3987.6912326812744,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "4c319279.354754",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2630.429588317871,
-        "y": 4026.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2573.6666145324707,
+        "y": 3989.6912326812744,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4102f097.0a51",
-                "f394576a.e4e1d8"
+                "5fe8d8f9.449b28",
+                "77e726f5.a576b8"
             ]
         ]
     },
     {
-        "id": "f6d3df5a.7d52a",
+        "id": "77e726f5.a576b8",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2666.3334159851074,
+        "y": 3752.358123779297,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e02da5bb.106d78",
         "type": "set",
         "name": "set is-trunked and segmentation-id in vm-network",
         "xml": "<set>\n<parameter name='$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].is-trunked'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].is-trunked`' />\n<parameter name='$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].segmentation-id'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].segmentation-id`' />\n",
         "comments": "",
-        "x": 2368.429588317871,
-        "y": 4076.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2311.6666145324707,
+        "y": 4039.6912326812744,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "a6a60ea4.9fb45",
+        "id": "f0d8d701.a9fbc8",
         "type": "switchNode",
         "name": "switch rn-index",
         "xml": "<switch test='`$rn-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2256.429588317871,
-        "y": 4184.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2199.6666145324707,
+        "y": 4147.691232681274,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6c6e5ed6.1638b"
+                "c4302cc3.3c659"
             ]
         ]
     },
     {
-        "id": "66f94089.96de5",
+        "id": "33b270a2.44aa78",
         "type": "set",
         "name": "set rn-index to related network length",
         "xml": "<set>\n<parameter name='rn-index' value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network_length`' />\n",
         "comments": "",
-        "x": 2328.429588317871,
-        "y": 4128.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2271.6666145324707,
+        "y": 4091.6912326812744,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "6c6e5ed6.1638b",
+        "id": "c4302cc3.3c659",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2420.429588317871,
-        "y": 4184.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2363.6666145324707,
+        "y": 4147.691232681274,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4cbc1f39.6eef5"
+                "be01e09d.5f1a68"
             ]
         ]
     },
     {
-        "id": "4cbc1f39.6eef5",
+        "id": "be01e09d.5f1a68",
         "type": "set",
         "name": "set rn-index to 0",
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",
         "comments": "",
-        "x": 2580.429588317871,
-        "y": 4184.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2523.6666145324707,
+        "y": 4147.691232681274,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "e617263a.f37478",
+        "id": "1ad9651a.f1635b",
         "type": "set",
         "name": "set related-network data",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$rn-index].network-id'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].related-networks.related-network[$saved-related-network-index].network-id`' />\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$rn-index].network-role'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].related-networks.related-network[$saved-related-network-index].network-role`' />\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$rn-index].vlan-tags.vlan-interface'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].related-networks.related-network[$saved-related-network-index].vlan-tags.vlan-interface`' />\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$rn-index].vlan-tags.lower-tag-id'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].related-networks.related-network[$saved-related-network-index].vlan-tags.lower-tag-id`' />\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$rn-index].vlan-tags.upper-tag-id'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].related-networks.related-network[$saved-related-network-index].vlan-tags.upper-tag-id`' />\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$rn-index].vlan-tags.is-private'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$saved-vnf-network-index].related-networks.related-network[$saved-related-network-index].vlan-tags.is-private`' />\n",
         "comments": "",
-        "x": 2280.429588317871,
-        "y": 4236.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2223.6666145324707,
+        "y": 4199.691232681274,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "5c5c0e0.7b249f4",
+        "id": "d7d72478.3bd0f",
         "type": "set",
         "name": "set new related network length",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network_length'\n  value='`$rn-index + 1`' />\n",
         "comments": "",
-        "x": 2298.429588317871,
-        "y": 4288.430356025696,
-        "z": "565447bf.1f1598",
+        "x": 2241.6666145324707,
+        "y": 4251.691232681274,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "456cf44d.c85fac",
+        "id": "ff4fdb5d.de766",
         "type": "switchNode",
         "name": "switch found-related-network",
         "xml": "<switch test='`$found-related-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2682.9296836853027,
-        "y": 3952.096594810486,
-        "z": "565447bf.1f1598",
+        "x": 2638.6666679382324,
+        "y": 3940.357879638672,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "65005548.e9ca8c"
+                "eba867d8.f5c258"
             ]
         ]
     },
     {
-        "id": "65005548.e9ca8c",
+        "id": "eba867d8.f5c258",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2879.5965461730957,
-        "y": 3952.0969667434692,
-        "z": "565447bf.1f1598",
+        "x": 2835.3335304260254,
+        "y": 3940.3582515716553,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a15ee876.ab6228"
+                "5c631904.ed64f8"
             ]
         ]
     },
     {
-        "id": "a15ee876.ab6228",
+        "id": "5c631904.ed64f8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3009.5964317321777,
-        "y": 3950.430090904236,
-        "z": "565447bf.1f1598",
+        "x": 2965.3334159851074,
+        "y": 3938.691375732422,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "29f5561c.96eb2a",
+        "id": "3d29969a.2c72ea",
         "type": "set",
         "name": "save indexes",
         "xml": "<set>\n<parameter name='saved-vnf-network-index' value='`$vnf-network-index`' />\n<parameter name='saved-related-network-index' value='`$related-network-index`' />\n",
         "comments": "",
-        "x": 3449.5966453552246,
-        "y": 3902.0969648361206,
-        "z": "565447bf.1f1598",
+        "x": 3405.3336296081543,
+        "y": 3890.3582496643066,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "9a10ba16.3aa6a8",
+        "id": "6004d50b.b6d2f4",
         "type": "execute",
         "name": "generate cp-instance-id",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n<parameter name=\"ctx-destination\" value=\"cp-instance-id\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1738.5011367797852,
-        "y": 4931.621017932892,
-        "z": "565447bf.1f1598",
+        "x": 1694.2381210327148,
+        "y": 4919.882302761078,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "878cd74b.b859a8",
+        "id": "d7ac8cb2.6c2d6",
         "type": "save",
         "name": "save cp to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"cp\" \n\tkey=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n\t  AND cp.cp-instance-id = $cp-instance-id\" >\n<parameter name=\"cp-instance-id\" value=\"`$cp-instance-id`\" />\n<parameter name=\"port-id\" value=\"0\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1720.1677589416504,
-        "y": 4998.2875237464905,
-        "z": "565447bf.1f1598",
+        "x": 1675.90474319458,
+        "y": 4986.5488085746765,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "38156f19.d3b92",
-                "6b679924.dbe638"
+                "f5dd2f0d.45402",
+                "29186d18.403c52"
             ]
         ]
     },
     {
-        "id": "38156f19.d3b92",
+        "id": "f5dd2f0d.45402",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1909.167739868164,
-        "y": 4973.954137265682,
-        "z": "565447bf.1f1598",
+        "x": 1864.9047241210938,
+        "y": 4962.215422093868,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "115e423c.501c8e"
+                "b5157fa2.e880a8"
             ]
         ]
     },
     {
-        "id": "115e423c.501c8e",
+        "id": "b5157fa2.e880a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2076.334487915039,
-        "y": 4989.748570859432,
-        "z": "565447bf.1f1598",
+        "x": 2032.0714721679688,
+        "y": 4978.009855687618,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b0761ca.5d4cce",
-                "1254304a.7d8a4"
+                "436800e9.7b6c18",
+                "6cb8c914.ed3b6"
             ]
         ]
     },
     {
-        "id": "6b679924.dbe638",
+        "id": "29186d18.403c52",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1914.167739868164,
-        "y": 5023.620397031307,
-        "z": "565447bf.1f1598",
+        "x": 1869.9047241210938,
+        "y": 5011.881681859493,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "115e423c.501c8e"
+                "b5157fa2.e880a8"
             ]
         ]
     },
     {
-        "id": "52bb6b86.aae8d4",
+        "id": "436800e9.7b6c18",
+        "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 creating cp object in AAI\" />\n",
+        "comments": "",
+        "x": 2197.5714836120605,
+        "y": 4989.8820605278015,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "8ef35028.d3c7d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1514.9774589538574,
-        "y": 5200.905811786652,
-        "z": "565447bf.1f1598",
+        "x": 1470.714443206787,
+        "y": 5189.167096614838,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1faae59a.ef7cea",
-                "3ff39820.94ba88",
-                "9a10ba16.3aa6a8",
-                "878cd74b.b859a8",
-                "eebcfd35.55fb9",
-                "82ba34b3.fa1f48"
+                "bf8a8114.e4c588",
+                "c587555a.9764c8",
+                "6004d50b.b6d2f4",
+                "d7ac8cb2.6c2d6",
+                "d458e80b.85d49",
+                "c756041f.7b47"
             ]
         ]
     },
     {
-        "id": "1faae59a.ef7cea",
+        "id": "bf8a8114.e4c588",
         "type": "set",
         "name": "set connection point data",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].connection-point.connection-point-id'\n  value='`$cp-instance-id`' />\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].connection-point.port-id'\n  value='0' />\n",
         "comments": "",
-        "x": 1750.5013008117676,
-        "y": 5076.1450934410095,
-        "z": "565447bf.1f1598",
+        "x": 1706.2382850646973,
+        "y": 5064.406378269196,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "933839f3.7f2e78",
+        "id": "1c962043.9ade4",
         "type": "comment",
         "name": "Floating IPs",
         "info": "",
         "comments": "",
-        "x": 1311.2631187438965,
-        "y": 6058.430211722851,
-        "z": "565447bf.1f1598",
+        "x": 1267.0001029968262,
+        "y": 6046.691496551037,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "eebcfd35.55fb9",
+        "id": "d458e80b.85d49",
         "type": "for",
         "name": "for each vnf-network",
         "xml": "<for index='vnf-network-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1734.5963020324707,
-        "y": 5472.4305872917175,
-        "z": "565447bf.1f1598",
+        "x": 1690.3332862854004,
+        "y": 5460.691872119904,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "cc35a2e9.bcb07"
+                "581b2add.f9572c"
             ]
         ]
     },
     {
-        "id": "62b74236.aad4fc",
+        "id": "54717650.92e9c8",
         "type": "save",
         "name": "save cp relationship to l3-network",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"cp:relationship-list\"\n   key=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n     AND cp.cp-instance-id = $cp-instance-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].network-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2372.9297828674316,
-        "y": 5472.097095012665,
-        "z": "565447bf.1f1598",
+        "x": 2328.6667671203613,
+        "y": 5460.358379840851,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d2f01f95.109f6",
-                "4a44bec7.49b2a"
+                "be199432.2a2058",
+                "5e67f7b6.3d5b98"
             ]
         ]
     },
     {
-        "id": "6441b421.db195c",
+        "id": "7aece173.4d8018",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2744.7628211975098,
-        "y": 5445.415043354034,
-        "z": "565447bf.1f1598",
+        "x": 2700.4998054504395,
+        "y": 5433.6763281822205,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "64e7c13b.82899",
-                "1254304a.7d8a4"
+                "e9b2c07c.a44a5",
+                "c9a07f93.c346a8"
             ]
         ]
     },
     {
-        "id": "21487f6.95f1f8",
+        "id": "fde9d8b6.adb198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2744.762897491455,
-        "y": 5498.414802074432,
-        "z": "565447bf.1f1598",
+        "x": 2700.4998817443848,
+        "y": 5486.676086902618,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f4e9414e.c0a39",
-                "1254304a.7d8a4"
+                "e9b2c07c.a44a5",
+                "7f2c6758.f68da8"
             ]
         ]
     },
     {
-        "id": "d2f01f95.109f6",
+        "id": "be199432.2a2058",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2587.9297065734863,
-        "y": 5445.430713176727,
-        "z": "565447bf.1f1598",
+        "x": 2543.666690826416,
+        "y": 5433.691998004913,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6441b421.db195c"
+                "7aece173.4d8018"
             ]
         ]
     },
     {
-        "id": "4a44bec7.49b2a",
+        "id": "5e67f7b6.3d5b98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2596.5012397766113,
-        "y": 5498.049857616425,
-        "z": "565447bf.1f1598",
+        "x": 2552.238224029541,
+        "y": 5486.311142444611,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "21487f6.95f1f8"
+                "fde9d8b6.adb198"
             ]
         ]
     },
     {
-        "id": "82ba34b3.fa1f48",
+        "id": "c9a07f93.c346a8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network in AAI\" />\n",
+        "comments": "",
+        "x": 2872.6666145324707,
+        "y": 5456.3587040901175,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "7f2c6758.f68da8",
+        "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=\"Not-found error updating cp relationship to l3-network\" />\n",
+        "comments": "",
+        "x": 2867.833522796631,
+        "y": 5508.009911060332,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "e9b2c07c.a44a5",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3074.3333778381348,
+        "y": 5406.35870218277,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c756041f.7b47",
         "type": "for",
         "name": "for each vm-network",
         "xml": "<for silentFailure='true' index='network-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1734.5964546203613,
-        "y": 5633.096942424774,
-        "z": "565447bf.1f1598",
+        "x": 1690.333438873291,
+        "y": 5621.35822725296,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1f595d1a.8ff293"
+                "f305688b.5fd87"
             ]
         ]
     },
     {
-        "id": "b629e1fe.afa3d",
+        "id": "8f7eb5ab.e0a03",
         "type": "save",
         "name": "save cp relationship to l3-network and vlan-tag",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"cp:relationship-list\"\n   key=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n     AND cp.cp-instance-id = $cp-instance-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/l3-networks/l3-network/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$related-network-index].network-id`\" />\n    <parameter name=\"relationship-list.relationship[1].related-to\" value=\"vlan-tag\" />\n    <parameter name=\"relationship-list.relationship[1].related-link\"\n      value=\"`'/aai/v$/network/vlan-tags/vlan-tag/' +\n        $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$related-network-index].vlan-tags.vlan-interface`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2654.2634620666504,
-        "y": 5631.096937656403,
-        "z": "565447bf.1f1598",
+        "x": 2610.00044631958,
+        "y": 5619.358222484589,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6dc366c6.1b2608",
-                "a704ca3.36a4b38"
+                "9128c14c.d846d",
+                "7ee1490a.c8b148"
             ]
         ]
     },
     {
-        "id": "12c7943c.a55a2c",
+        "id": "d67f366c.178058",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3061.096508026123,
-        "y": 5604.414236545564,
-        "z": "565447bf.1f1598",
+        "x": 3016.8334922790527,
+        "y": 5592.67552137375,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "94072bfe.632c28",
-                "1254304a.7d8a4"
+                "4bf8ece5.760084",
+                "e9b2c07c.a44a5"
             ]
         ]
     },
     {
-        "id": "2b88635f.5a533c",
+        "id": "203e49a1.25bf26",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3061.0965843200684,
-        "y": 5657.413995265962,
-        "z": "565447bf.1f1598",
+        "x": 3016.833568572998,
+        "y": 5645.675280094148,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4462ce4a.8f7a5",
-                "1254304a.7d8a4"
+                "5212701d.e9f5d8",
+                "e9b2c07c.a44a5"
             ]
         ]
     },
     {
-        "id": "6dc366c6.1b2608",
+        "id": "9128c14c.d846d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2904.2633934020996,
-        "y": 5604.4299063682565,
-        "z": "565447bf.1f1598",
+        "x": 2860.0003776550293,
+        "y": 5592.691191196443,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "12c7943c.a55a2c"
+                "d67f366c.178058"
             ]
         ]
     },
     {
-        "id": "a704ca3.36a4b38",
+        "id": "7ee1490a.c8b148",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2912.8349266052246,
-        "y": 5657.049050807954,
-        "z": "565447bf.1f1598",
+        "x": 2868.5719108581543,
+        "y": 5645.31033563614,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2b88635f.5a533c"
+                "203e49a1.25bf26"
             ]
         ]
     },
     {
-        "id": "1de94581.c488da",
+        "id": "4bf8ece5.760084",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network and vlan-tag in AAI\" />\n",
+        "comments": "",
+        "x": 3189.000301361084,
+        "y": 5615.357897281647,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "5212701d.e9f5d8",
+        "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=\"Not-found error updating cp relationship to l3-network and vlan-tag\" />\n",
+        "comments": "",
+        "x": 3184.167209625244,
+        "y": 5667.009104251862,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "76067898.ad5ad8",
         "type": "for",
         "name": "for each related-network",
         "xml": "<for silentFailure='true' index='related-network-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2350.2632942199707,
-        "y": 5631.096938610077,
-        "z": "565447bf.1f1598",
+        "x": 2306.0002784729004,
+        "y": 5619.358223438263,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b629e1fe.afa3d"
+                "8f7eb5ab.e0a03"
             ]
         ]
     },
     {
-        "id": "88b43b76.6a75d8",
+        "id": "f10f9580.1e0308",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-generate-heat-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-generate-heat-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 608.5965881347656,
-        "y": 6874.097199082375,
-        "z": "565447bf.1f1598",
+        "x": 564.3335723876953,
+        "y": 6862.358483910561,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb67c127.33c7c",
+        "id": "e7fac88.832d038",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmoduleheat.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 429.92991638183594,
-        "y": 6922.097302079201,
-        "z": "565447bf.1f1598",
+        "x": 385.6669006347656,
+        "y": 6910.358586907387,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "67fa2696.640ed8",
+        "id": "def45b38.4bd55",
         "type": "switchNode",
         "name": "switch input vf-module-name",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 581.2630195617676,
-        "y": 2357.929759979248,
-        "z": "565447bf.1f1598",
+        "x": 537.0000038146973,
+        "y": 2346.191044807434,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "de18afec.e1079",
-                "49fb0ac8.04b604"
+                "8db4c205.376b",
+                "1b446cec.4500eb"
             ]
         ]
     },
     {
-        "id": "de18afec.e1079",
+        "id": "8db4c205.376b",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 803.7629852294922,
-        "y": 2280.4297199249268,
-        "z": "565447bf.1f1598",
+        "x": 736.9999961853027,
+        "y": 2323.690947532654,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1c4c53fe.44b0dc"
+                "eae1dfc6.c9a018"
             ]
         ]
     },
     {
-        "id": "49fb0ac8.04b604",
+        "id": "1b446cec.4500eb",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 805.4415855407715,
-        "y": 2453.0483045578003,
-        "z": "565447bf.1f1598",
+        "x": 737.4285888671875,
+        "y": 2373.81005859375,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "755e8713.bcc1c8"
+                "9c7304a7.47b438"
             ]
         ]
     },
     {
-        "id": "a421948e.7e12b8",
+        "id": "8bfe9202.c720d",
         "type": "for",
         "name": "for each vnfc-subnet-role",
         "xml": "<for index='subnet-role-index' start='0'\n  end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1338.7631187438965,
-        "y": 3152.929436683655,
-        "z": "565447bf.1f1598",
+        "x": 1294.5001029968262,
+        "y": 3141.190721511841,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ebf9c337.4e138"
+                "8622c4a.ef650b8"
             ]
         ]
     },
     {
-        "id": "ebf9c337.4e138",
+        "id": "8622c4a.ef650b8",
         "type": "for",
         "name": "for each vnfc-address-family",
         "xml": "<for index='address-family-index' start='0'\n  end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1587.096378326416,
-        "y": 3152.929436683655,
-        "z": "565447bf.1f1598",
+        "x": 1542.8333625793457,
+        "y": 3141.190721511841,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a86ece19.ececb"
+                "4a1dd17d.5b9948"
             ]
         ]
     },
     {
-        "id": "fcaf9b9.f1d4568",
+        "id": "7f309670.a38298",
         "type": "for",
         "name": "for each vm-type",
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 544.5962944030762,
-        "y": 2871.262773513794,
-        "z": "565447bf.1f1598",
+        "x": 500.33327865600586,
+        "y": 2859.52405834198,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f8bef45b.8c1d38"
+                "5a24cbf3.c8832c"
             ]
         ]
     },
     {
-        "id": "f8bef45b.8c1d38",
+        "id": "5a24cbf3.c8832c",
         "type": "for",
         "name": "for each vnfc",
         "xml": "<for silentFailure='true' index='vnfc-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 726.2630729675293,
-        "y": 2869.929922103882,
-        "z": "565447bf.1f1598",
+        "x": 682.000057220459,
+        "y": 2858.191206932068,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "97b3bca9.21b53"
+                "34b1dbe0.125be4"
             ]
         ]
     },
     {
-        "id": "97b3bca9.21b53",
+        "id": "34b1dbe0.125be4",
         "type": "for",
         "name": "for each vnfc-network",
         "xml": "<for silentFailure='true' index='vnfc-network-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 927.4296455383301,
-        "y": 2869.76261138916,
-        "z": "565447bf.1f1598",
+        "x": 883.1666297912598,
+        "y": 2858.023896217346,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a3d88602.8525e8"
+                "c2b28bb1.c543b8"
             ]
         ]
     },
     {
-        "id": "a3d88602.8525e8",
+        "id": "c2b28bb1.c543b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1139.5963172912598,
-        "y": 2868.7629718780518,
-        "z": "565447bf.1f1598",
+        "x": 1095.3333015441895,
+        "y": 2857.024256706238,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d5a5aef3.81764",
-                "37a20e05.126042",
-                "f86420d0.f8cb4",
-                "a421948e.7e12b8"
+                "a041d6a5.1eaa48",
+                "c20a57e8.44ed5",
+                "765a4edc.cbc36",
+                "8bfe9202.c720d"
             ]
         ]
     },
     {
-        "id": "d5a5aef3.81764",
+        "id": "a041d6a5.1eaa48",
         "type": "set",
         "name": "set vnf-network-index to -1",
         "xml": "<set>\n<parameter name='vnf-network-index' value='-1' />\n",
         "comments": "",
-        "x": 1351.2630348205566,
-        "y": 2822.096185684204,
-        "z": "565447bf.1f1598",
+        "x": 1307.0000190734863,
+        "y": 2810.35747051239,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "37a20e05.126042",
+        "id": "c20a57e8.44ed5",
         "type": "for",
         "name": "for each vnf-network",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1332.9298248291016,
-        "y": 2868.7629375457764,
-        "z": "565447bf.1f1598",
+        "x": 1288.6668090820312,
+        "y": 2857.0242223739624,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1cb49556.32692b"
+                "4e0e361c.f4c848"
             ]
         ]
     },
     {
-        "id": "1cb49556.32692b",
+        "id": "4e0e361c.f4c848",
         "type": "switchNode",
         "name": "switch network-roles match?",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-network-role\n  == $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$idx].network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574.5962944030762,
-        "y": 2867.096432685852,
-        "z": "565447bf.1f1598",
+        "x": 1530.3332786560059,
+        "y": 2855.357717514038,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d1c77ddb.a0354"
+                "807f0004.8adbb8"
             ]
         ]
     },
     {
-        "id": "d1c77ddb.a0354",
+        "id": "807f0004.8adbb8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1771.2629737854004,
-        "y": 2867.096351623535,
-        "z": "565447bf.1f1598",
+        "x": 1726.99995803833,
+        "y": 2855.357636451721,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1428ec99.f2d413"
+                "253c224a.85d896"
             ]
         ]
     },
     {
-        "id": "1428ec99.f2d413",
+        "id": "253c224a.85d896",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1924.5961952209473,
-        "y": 2867.0962238311768,
-        "z": "565447bf.1f1598",
+        "x": 1880.333179473877,
+        "y": 2855.357508659363,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fcce8154.9685e",
-                "cbd9fa48.bee5b8",
-                "491c8e10.8347"
+                "a6f5eb0a.e707c8",
+                "9ce5336a.719328",
+                "ca1a48c3.b1baa8"
             ]
         ]
     },
     {
-        "id": "fcce8154.9685e",
+        "id": "a6f5eb0a.e707c8",
         "type": "set",
         "name": "set vnf-network-index",
         "xml": "<set>\n<parameter name='vnf-network-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 2131.263027191162,
-        "y": 2815.4296016693115,
-        "z": "565447bf.1f1598",
+        "x": 2087.000011444092,
+        "y": 2803.6908864974976,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "cbd9fa48.bee5b8",
+        "id": "9ce5336a.719328",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2086.2629432678223,
-        "y": 2905.4295225143433,
-        "z": "565447bf.1f1598",
+        "x": 2041.999927520752,
+        "y": 2893.6908073425293,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "f86420d0.f8cb4",
+        "id": "765a4edc.cbc36",
         "type": "switchNode",
         "name": "switch vnf-network-index",
         "xml": "<switch test='`$vnf-network-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1344.596363067627,
-        "y": 2928.762939453125,
-        "z": "565447bf.1f1598",
+        "x": 1300.3333473205566,
+        "y": 2917.024224281311,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "79b99590.d3fcac"
+                "244dfb68.71e964"
             ]
         ]
     },
     {
-        "id": "79b99590.d3fcac",
+        "id": "244dfb68.71e964",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1536.2630043029785,
-        "y": 2928.76318359375,
-        "z": "565447bf.1f1598",
+        "x": 1491.9999885559082,
+        "y": 2917.024468421936,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "917a6c27.9bf3"
+                "10ed32c9.c47a65"
             ]
         ]
     },
     {
-        "id": "917a6c27.9bf3",
+        "id": "10ed32c9.c47a65",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1684.5961952209473,
-        "y": 2927.0962238311768,
-        "z": "565447bf.1f1598",
+        "x": 1640.333179473877,
+        "y": 2915.357508659363,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "a6ff636a.1da36",
-                "f394576a.e4e1d8"
+                "404dfa80.b1344c",
+                "c6cafcd7.27543"
             ]
         ]
     },
     {
-        "id": "95349f39.6e5a9",
+        "id": "404dfa80.b1344c",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3168.6668128967285,
+        "y": 2767.024085998535,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c6cafcd7.27543",
+        "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=\"`'VNFC network role '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-network-role\n      + ' is not found in VNF network list'\n      `\" />\n\n\n\n",
+        "comments": "",
+        "x": 1808.6665534973145,
+        "y": 2933.690760612488,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "c35abd31.4d97c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2376.262912750244,
-        "y": 3337.0960750579834,
-        "z": "565447bf.1f1598",
+        "x": 2331.999897003174,
+        "y": 3325.3573598861694,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9e396ac0.1c0cd8",
-                "f53353ba.f6cea",
-                "35326a6f.8ce8b6"
+                "96ccd849.43cf7",
+                "ff243880.f35278",
+                "6cdf3e0.84820c4"
             ]
         ]
     },
     {
-        "id": "9e396ac0.1c0cd8",
+        "id": "96ccd849.43cf7",
         "type": "for",
         "name": "for each subnet-data",
         "xml": "<for index='subnet-data-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2572.9296646118164,
-        "y": 3292.0959939956665,
-        "z": "565447bf.1f1598",
+        "x": 2528.666648864746,
+        "y": 3280.3572788238525,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d3c7828c.9a35d"
+                "2cef54b4.065124"
             ]
         ]
     },
     {
-        "id": "d3c7828c.9a35d",
+        "id": "2cef54b4.065124",
         "type": "switchNode",
         "name": "address-families match?",
         "xml": "<switch test='`$tmp.address-family\n  == $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].ip-version`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2799.596290588379,
-        "y": 3292.0959939956665,
-        "z": "565447bf.1f1598",
+        "x": 2755.3332748413086,
+        "y": 3280.3572788238525,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c4cd4a9c.110088"
+                "37df0574.9a5ed2"
             ]
         ]
     },
     {
-        "id": "c4cd4a9c.110088",
+        "id": "37df0574.9a5ed2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2979.5962562561035,
-        "y": 3292.0964002609253,
-        "z": "565447bf.1f1598",
+        "x": 2935.333240509033,
+        "y": 3280.3576850891113,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d297a29d.32368"
+                "788f6a84.68199c"
             ]
         ]
     },
     {
-        "id": "801d0ec7.9db1b",
+        "id": "c57c0c21.024ab8",
         "type": "set",
         "name": "set tmp.address-family",
         "xml": "<set>\n<parameter name='tmp.address-family'\n  value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-address-family`' />\n",
         "comments": "",
-        "x": 2404.596248626709,
-        "y": 3155.429488182068,
-        "z": "565447bf.1f1598",
+        "x": 2360.3332328796387,
+        "y": 3143.690773010254,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "a86ece19.ececb",
+        "id": "4a1dd17d.5b9948",
         "type": "switchNode",
         "name": "switch vnfc-subnet-ip_length",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1849.596591949463,
-        "y": 3152.096523284912,
-        "z": "565447bf.1f1598",
+        "x": 1805.3335762023926,
+        "y": 3140.357808113098,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b8041b24.2b66c8",
-                "9c9140dc.f2e33",
-                "489d3614.0f27f8"
+                "5f09d3a6.026514",
+                "56c1febc.7db6b",
+                "14889e9b.6b5371"
             ]
         ]
     },
     {
-        "id": "b8041b24.2b66c8",
+        "id": "5f09d3a6.026514",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2051.2631034851074,
-        "y": 3052.0960664749146,
-        "z": "565447bf.1f1598",
+        "x": 2007.000087738037,
+        "y": 3040.3573513031006,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8bb4c617.110b48"
+                "22b591c4.2e4326"
             ]
         ]
     },
     {
-        "id": "9c9140dc.f2e33",
+        "id": "56c1febc.7db6b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2047.6917343139648,
-        "y": 3238.048357963562,
-        "z": "565447bf.1f1598",
+        "x": 2003.4287185668945,
+        "y": 3226.309642791748,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b0bfddfb.72eba"
+                "ded80477.617b2"
             ]
         ]
     },
     {
-        "id": "8bb4c617.110b48",
+        "id": "22b591c4.2e4326",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2182.9296531677246,
-        "y": 3074.7628135681152,
-        "z": "565447bf.1f1598",
+        "x": 2138.6666374206543,
+        "y": 3063.0240983963013,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "38e8e50c.e85dda",
+        "id": "ebf41120.205ed",
         "type": "set",
         "name": "set subnet-id to -1",
         "xml": "<set>\n<parameter name='subnet-id' value='-1' />\n",
         "comments": "",
-        "x": 3072.9301719665527,
-        "y": 3453.7634801864624,
-        "z": "565447bf.1f1598",
+        "x": 3028.6671562194824,
+        "y": 3442.0247650146484,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "b0bfddfb.72eba",
+        "id": "ded80477.617b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2201.2631492614746,
-        "y": 3237.0959901809692,
-        "z": "565447bf.1f1598",
+        "x": 2157.0001335144043,
+        "y": 3225.3572750091553,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "801d0ec7.9db1b",
-                "95349f39.6e5a9"
+                "c57c0c21.024ab8",
+                "c35abd31.4d97c8"
             ]
         ]
     },
     {
-        "id": "d34b6157.8f35a",
+        "id": "62a4f148.c202c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4332.929769515991,
-        "y": 3625.429957151413,
-        "z": "565447bf.1f1598",
+        "x": 4288.666753768921,
+        "y": 3613.691241979599,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "88064ec.10dddb",
-                "52c4ad67.8cbd34"
+                "afef3972.79782",
+                "4862bc5a.5fb3f4"
             ]
         ]
     },
     {
-        "id": "52c4ad67.8cbd34",
+        "id": "4862bc5a.5fb3f4",
         "type": "execute",
         "name": "execute isInSameSubnet",
         "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"isInSameSubnet\">\n\t<parameter name=\"firstIPAddr\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].network-start-address`\" />\n\t<parameter name=\"secondIPAddr\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[0].vnfc-ip-address`\" />\n\t<parameter name=\"subnet\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].cidr-mask`\" />\n\t<parameter name=\"ipType\" value=\"`$ip-type`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4547.92977142334,
-        "y": 3675.4296309947968,
-        "z": "565447bf.1f1598",
+        "x": 4503.6667556762695,
+        "y": 3663.690915822983,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "995a749b.8f5f58"
+                "4c2388df.70ec08"
             ]
         ]
     },
     {
-        "id": "88064ec.10dddb",
+        "id": "afef3972.79782",
         "type": "switchNode",
         "name": "switch tmp.address-family",
         "xml": "<switch test='`$tmp.address-family`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4549.596927642822,
-        "y": 3582.096617460251,
-        "z": "565447bf.1f1598",
+        "x": 4505.333911895752,
+        "y": 3570.357902288437,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "431902e1.65a18c",
-                "a1d0494d.a8bd18"
+                "191fd488.fd1f6b",
+                "be67cd12.641768"
             ]
         ]
     },
     {
-        "id": "431902e1.65a18c",
+        "id": "191fd488.fd1f6b",
         "type": "outcome",
         "name": "ipv4",
         "xml": "<outcome value='ipv4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4752.930189768473,
-        "y": 3555.4298477967577,
-        "z": "565447bf.1f1598",
+        "x": 4708.667174021402,
+        "y": 3543.6911326249437,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "bb7bc2b4.6ce51"
+                "eaddc3bb.251ec8"
             ]
         ]
     },
     {
-        "id": "a1d0494d.a8bd18",
+        "id": "be67cd12.641768",
         "type": "outcome",
         "name": "ipv6",
         "xml": "<outcome value='ipv6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4752.929862976074,
-        "y": 3602.0963752269745,
-        "z": "565447bf.1f1598",
+        "x": 4708.666847229004,
+        "y": 3590.3576600551605,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "e7f8c0a.86c664"
+                "95abff5b.e35a8"
             ]
         ]
     },
     {
-        "id": "bb7bc2b4.6ce51",
+        "id": "eaddc3bb.251ec8",
         "type": "set",
         "name": "set ip-type parameter to IPv4",
         "xml": "<set>\n<parameter name='ip-type' value='IPv4' />\n",
         "comments": "",
-        "x": 4949.596675872803,
-        "y": 3553.7633216381073,
-        "z": "565447bf.1f1598",
+        "x": 4905.333660125732,
+        "y": 3542.0246064662933,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "e7f8c0a.86c664",
+        "id": "95abff5b.e35a8",
         "type": "set",
         "name": "set ip-type parameter to IPv6",
         "xml": "<set>\n<parameter name='ip-type' value='IPv6' />\n",
         "comments": "",
-        "x": 4954.59655380249,
-        "y": 3602.096394300461,
-        "z": "565447bf.1f1598",
+        "x": 4910.33353805542,
+        "y": 3590.357679128647,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "7fcd1d62.d76cb4",
+        "id": "8df6c942.a715e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4887.929801940918,
-        "y": 3675.096394300461,
-        "z": "565447bf.1f1598",
+        "x": 4843.666786193848,
+        "y": 3663.357679128647,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "5e631020.53cce",
-                "df991002.c407"
+                "a8addf18.4e3a2",
+                "7cc78bb8.388714"
             ]
         ]
     },
     {
-        "id": "5e631020.53cce",
+        "id": "a8addf18.4e3a2",
         "type": "set",
         "name": "set subnet-id",
         "xml": "<set>\n<parameter name='subnet-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id`' />\n",
         "comments": "",
-        "x": 5066.263122558594,
-        "y": 3651.762881040573,
-        "z": "565447bf.1f1598",
+        "x": 5022.000106811523,
+        "y": 3640.024165868759,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "df991002.c407",
+        "id": "7cc78bb8.388714",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5051.263126373291,
-        "y": 3698.4298751354218,
-        "z": "565447bf.1f1598",
+        "x": 5007.000110626221,
+        "y": 3686.691159963608,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "4e4fca65.cbf754",
+        "id": "5250a99a.907d1",
         "type": "switchNode",
         "name": "switch subnet-id",
         "xml": "<switch test='`$subnet-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3064.596046447754,
-        "y": 3615.430214881897,
-        "z": "565447bf.1f1598",
+        "x": 3020.3330307006836,
+        "y": 3603.691499710083,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "5fc3b8b.62e4a48"
+                "d823fb40.54f4"
             ]
         ]
     },
     {
-        "id": "5fc3b8b.62e4a48",
+        "id": "d823fb40.54f4",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221.26261138916,
-        "y": 3615.4301500320435,
-        "z": "565447bf.1f1598",
+        "x": 3176.99959564209,
+        "y": 3603.6914348602295,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1fa6c512.92b1cb"
+                "4bb7b0dc.89ed5"
             ]
         ]
     },
     {
-        "id": "1fa6c512.92b1cb",
+        "id": "4bb7b0dc.89ed5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3369.595802307129,
-        "y": 3613.76319026947,
-        "z": "565447bf.1f1598",
+        "x": 3325.3327865600586,
+        "y": 3602.0244750976562,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fec2cbd9.e930a8",
-                "f394576a.e4e1d8"
+                "12c0eff5.7b1ef",
+                "404dfa80.b1344c"
             ]
         ]
     },
     {
-        "id": "10262cd6.950543",
+        "id": "12c0eff5.7b1ef",
+        "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=\"`'Not able to find VNF network subnet that contains address '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[0].vnfc-ip-address\n      `\" />\n\n\n\n",
+        "comments": "",
+        "x": 3493.666118621826,
+        "y": 3618.6909503936768,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "324552d3.28633e",
         "type": "set",
         "name": "set subnet-id in vnfc-ip-assignments (temp variable)",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id' value='`$subnet-id`' />\n",
         "comments": "",
-        "x": 3176.2626914978027,
-        "y": 3692.0969858169556,
-        "z": "565447bf.1f1598",
+        "x": 3131.9996757507324,
+        "y": 3680.3582706451416,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "7b6a70b.67d389",
+        "id": "1781a3e7.247ed4",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodulec.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 529.5962867736816,
-        "y": 3287.0962238311768,
-        "z": "565447bf.1f1598",
+        "x": 485.3332710266113,
+        "y": 3275.357508659363,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "995a749b.8f5f58",
+        "id": "4c2388df.70ec08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4734.596374511719,
-        "y": 3675.4301192760468,
-        "z": "565447bf.1f1598",
+        "x": 4690.333358764648,
+        "y": 3663.691404104233,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7fcd1d62.d76cb4"
+                "8df6c942.a715e"
             ]
         ]
     },
     {
-        "id": "491c8e10.8347",
+        "id": "ca1a48c3.b1baa8",
         "type": "set",
         "name": "set network-id",
         "xml": "<set>\n<parameter name='$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].network-id'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$idx].network-id`' />\n",
         "comments": "",
-        "x": 2107.929531097412,
-        "y": 2860.429684638977,
-        "z": "565447bf.1f1598",
+        "x": 2063.666515350342,
+        "y": 2848.690969467163,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "a45139cd.c06788",
+        "id": "8ca3ab85.032598",
         "type": "switchNode",
         "name": "switch nfc-naming-code",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-naming-code`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1306.262996673584,
-        "y": 4475.42941236496,
-        "z": "565447bf.1f1598",
+        "x": 1261.9999809265137,
+        "y": 4463.690697193146,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7364ca38.2e5154",
-                "58d89920.1583e8"
+                "23c8931f.52f9cc",
+                "57df7e5d.984c2"
             ]
         ]
     },
     {
-        "id": "7364ca38.2e5154",
+        "id": "23c8931f.52f9cc",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1491.2629432678223,
-        "y": 4450.42923116684,
-        "z": "565447bf.1f1598",
+        "x": 1446.999927520752,
+        "y": 4438.690515995026,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8158813c.66973"
+                "a1c6b38e.a41d3"
             ]
         ]
     },
     {
-        "id": "58d89920.1583e8",
+        "id": "57df7e5d.984c2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1489.3582153320312,
-        "y": 4497.215058803558,
-        "z": "565447bf.1f1598",
+        "x": 1445.095199584961,
+        "y": 4485.476343631744,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3d2f5ba8.c13584"
+                "59f2b757.a63258"
             ]
         ]
     },
     {
-        "id": "8158813c.66973",
+        "id": "a1c6b38e.a41d3",
         "type": "set",
         "name": "set tmp.nfc-naming-code to DEFAULT",
         "xml": "<set>\n<parameter name='tmp.nfc-naming-code' value='DEFAULT' />\n",
         "comments": "",
-        "x": 1722.9297142028809,
-        "y": 4448.762581348419,
-        "z": "565447bf.1f1598",
+        "x": 1678.6666984558105,
+        "y": 4437.023866176605,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "3d2f5ba8.c13584",
+        "id": "59f2b757.a63258",
         "type": "set",
         "name": "set tmp.nfc-naming-code",
         "xml": "<set>\n<parameter name='tmp.nfc-naming-code' value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-naming-code`' />\n",
         "comments": "",
-        "x": 1679.5962257385254,
-        "y": 4497.096079349518,
-        "z": "565447bf.1f1598",
+        "x": 1635.333209991455,
+        "y": 4485.357364177704,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "d5639dcc.50d87",
+        "id": "805bb33d.dc18f",
         "type": "switchNode",
         "name": "switch nfc-function",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-function`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1294.5963287353516,
-        "y": 4573.762586116791,
-        "z": "565447bf.1f1598",
+        "x": 1250.3333129882812,
+        "y": 4562.023870944977,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "b1314442.1e8e58",
-                "4e90e22a.aab6cc"
+                "7a1bcd20.0ffb04",
+                "58313c0d.8e25dc"
             ]
         ]
     },
     {
-        "id": "b1314442.1e8e58",
+        "id": "7a1bcd20.0ffb04",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1491.2629356384277,
-        "y": 4548.762383937836,
-        "z": "565447bf.1f1598",
+        "x": 1446.9999198913574,
+        "y": 4537.023668766022,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c5c1ae87.86af"
+                "8f8878a3.b40b28"
             ]
         ]
     },
     {
-        "id": "4e90e22a.aab6cc",
+        "id": "58313c0d.8e25dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1489.3582077026367,
-        "y": 4595.548211574554,
-        "z": "565447bf.1f1598",
+        "x": 1445.0951919555664,
+        "y": 4583.8094964027405,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ba48d68e.f81aa8"
+                "33d0dbb1.211884"
             ]
         ]
     },
     {
-        "id": "c5c1ae87.86af",
+        "id": "8f8878a3.b40b28",
         "type": "set",
         "name": "set tmp.nfc-function to DEFAULT",
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='DEFAULT' />\n",
         "comments": "",
-        "x": 1702.9297180175781,
-        "y": 4547.0955929756165,
-        "z": "565447bf.1f1598",
+        "x": 1658.6667022705078,
+        "y": 4535.3568778038025,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "ba48d68e.f81aa8",
+        "id": "33d0dbb1.211884",
         "type": "set",
         "name": "set tmp.nfc-function",
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-function`' />\n",
         "comments": "",
-        "x": 1661.2628479003906,
-        "y": 4595.429254055023,
-        "z": "565447bf.1f1598",
+        "x": 1616.9998321533203,
+        "y": 4583.690538883209,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "cc35a2e9.bcb07",
+        "id": "f47ab8ac.f1f838",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2890.3333015441895,
+        "y": 2218.691004753113,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aa023fe5.47b5f8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2796.9998054504395,
+        "y": 2293.691004753113,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "d0aa2f4d.891c28",
+                "f47ab8ac.f1f838"
+            ]
+        ]
+    },
+    {
+        "id": "e944765.ab28a88",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2001.9998588562012,
+        "y": 2353.6908683776855,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "bcf4c56.2e632b8",
+                "f47ab8ac.f1f838"
+            ]
+        ]
+    },
+    {
+        "id": "589f1683.8c95c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2263.666723251343,
+        "y": 2408.691035270691,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "b1df2727.b9c3d",
+                "f47ab8ac.f1f838"
+            ]
+        ]
+    },
+    {
+        "id": "581b2add.f9572c",
         "type": "switchNode",
         "name": "switch network-roles match?",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-network-role\n  == $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1967.92964553833,
-        "y": 5472.4296135902405,
-        "z": "565447bf.1f1598",
+        "x": 1923.6666297912598,
+        "y": 5460.6908984184265,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7bf7e0e4.c2092"
+                "bcbba18a.60b55"
             ]
         ]
     },
     {
-        "id": "7bf7e0e4.c2092",
+        "id": "bcbba18a.60b55",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2166.263114929199,
-        "y": 5472.096768856049,
-        "z": "565447bf.1f1598",
+        "x": 2122.000099182129,
+        "y": 5460.358053684235,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "62b74236.aad4fc"
+                "54717650.92e9c8"
             ]
         ]
     },
     {
-        "id": "1f595d1a.8ff293",
+        "id": "f305688b.5fd87",
         "type": "switchNode",
         "name": "switch network-roles match?",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role\n  == $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1971.2629890441895,
-        "y": 5632.096061229706,
-        "z": "565447bf.1f1598",
+        "x": 1926.9999732971191,
+        "y": 5620.357346057892,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "47d7d211.80a5ec"
+                "fcdfc8c4.1ea6e8"
             ]
         ]
     },
     {
-        "id": "47d7d211.80a5ec",
+        "id": "fcdfc8c4.1ea6e8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2169.5964584350586,
-        "y": 5631.763216495514,
-        "z": "565447bf.1f1598",
+        "x": 2125.3334426879883,
+        "y": 5620.0245013237,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1de94581.c488da"
+                "76067898.ad5ad8"
             ]
         ]
     },
     {
-        "id": "316d52f.75519ae",
+        "id": "bc8c9230.4f5cf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1874.5962715148926,
-        "y": 6210.4294810295105,
-        "z": "565447bf.1f1598",
+        "x": 1830.3332557678223,
+        "y": 6198.6907658576965,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "c0647bff.dcfb98",
-                "5911a368.70726c"
+                "1f81499d.5e5af6",
+                "8e120f2d.e1456"
             ]
         ]
     },
     {
-        "id": "24db1747.589188",
+        "id": "5f97f00c.f2f7a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1876.2630195617676,
-        "y": 6525.429492473602,
-        "z": "565447bf.1f1598",
+        "x": 1832.0000038146973,
+        "y": 6513.690777301788,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "bdb5121f.d0648",
-                "9dacd2cd.93ab"
+                "47c03850.21f5a",
+                "7256be96.3662d"
             ]
         ]
     },
     {
-        "id": "5911a368.70726c",
+        "id": "8e120f2d.e1456",
         "type": "for",
         "name": "for each vnfc-network-role",
         "xml": "<for silentFailure='true' index='vnfc-network-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2091.2632179260254,
-        "y": 6268.762651920319,
-        "z": "565447bf.1f1598",
+        "x": 2047.000202178955,
+        "y": 6257.023936748505,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f138f006.e2934"
+                "2ff95408.117534"
             ]
         ]
     },
     {
-        "id": "14599bc4.dfcff4",
+        "id": "35f11c05.060024",
         "type": "save",
         "name": "save vip-ipv4-address-list relationship to cp",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vip-ipv4-address-list:relationship-list\"\n   key=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner\n\t  AND cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\n\t  AND vip-ipv4-address-list.vip-ipv4-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v4[$ipv4-index]\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"cp\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/vnfcs/vnfc/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n        + '/cps/cp/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].connection-point.connection-point-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2766.26314163208,
-        "y": 6268.762490749359,
-        "z": "565447bf.1f1598",
+        "x": 2722.0001258850098,
+        "y": 6257.023775577545,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "34dd5b17.9e06c4",
-                "c966a91b.7c68b8"
+                "6fc56971.00a6d8",
+                "5cf11136.58121"
             ]
         ]
     },
     {
-        "id": "52867741.452a08",
+        "id": "6f85c684.0cc928",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",
+        "comments": "",
+        "x": 3280.3333473205566,
+        "y": 6250.357183933258,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "383b2271.606576",
+        "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=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",
+        "comments": "",
+        "x": 3280.500316619873,
+        "y": 6300.341357648373,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "1646f205.fdcaa6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3158.09623336792,
-        "y": 6242.080272197723,
-        "z": "565447bf.1f1598",
+        "x": 3113.8332176208496,
+        "y": 6230.341557025909,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1a54f803.3243e8",
-                "fc515f97.dc4ef"
+                "6f85c684.0cc928",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "fbf6e33e.69daa",
+        "id": "8458375f.c06d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3158.0963096618652,
-        "y": 6295.080030918121,
-        "z": "565447bf.1f1598",
+        "x": 3113.833293914795,
+        "y": 6283.341315746307,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9ebbd632.ef43d8",
-                "fc515f97.dc4ef"
+                "383b2271.606576",
+                "7d8d801d.5aba58"
             ]
         ]
     },
     {
-        "id": "34dd5b17.9e06c4",
+        "id": "6fc56971.00a6d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3001.2631187438965,
-        "y": 6242.095942020416,
-        "z": "565447bf.1f1598",
+        "x": 2957.000102996826,
+        "y": 6230.357226848602,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "52867741.452a08"
+                "1646f205.fdcaa6"
             ]
         ]
     },
     {
-        "id": "c966a91b.7c68b8",
+        "id": "5cf11136.58121",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3009.8346519470215,
-        "y": 6294.7150864601135,
-        "z": "565447bf.1f1598",
+        "x": 2965.571636199951,
+        "y": 6282.9763712883,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "fbf6e33e.69daa"
+                "8458375f.c06d8"
             ]
         ]
     },
     {
-        "id": "9dacd2cd.93ab",
+        "id": "7256be96.3662d",
         "type": "for",
         "name": "for each vnfc-network-role",
         "xml": "<for silentFailure='true' index='vnfc-network-role-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2092.929615020752,
-        "y": 6592.096061229706,
-        "z": "565447bf.1f1598",
+        "x": 2048.6665992736816,
+        "y": 6580.357346057892,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "2dbd930d.06759c"
+                "6947a958.cfef3"
             ]
         ]
     },
     {
-        "id": "6321a56a.de355c",
+        "id": "8da01247.1c11d8",
         "type": "save",
         "name": "save vip-ipv6-address-list relationship to cp",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"vip-ipv6-address-list:relationship-list\"\n   key=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner\n\t  AND cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region\n\t  AND vip-ipv6-address-list.vip-ipv6-address = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$vm-network-index].floating-ips.floating-ip-v6[$ipv6-index]\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"cp\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/vnfcs/vnfc/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\n        + '/cps/cp/'\n        + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].connection-point.connection-point-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2762.9295692443848,
-        "y": 6590.428843975067,
-        "z": "565447bf.1f1598",
+        "x": 2718.6665534973145,
+        "y": 6578.690128803253,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7666db3f.f47e74",
-                "639b285f.08d4e8"
+                "d83f3f7b.caadf",
+                "cc62185e.d573c8"
             ]
         ]
     },
     {
-        "id": "f0c87b03.93a6b8",
+        "id": "540af8f6.c0c8e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",
+        "comments": "",
+        "x": 3276.9997749328613,
+        "y": 6572.023537158966,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "64f21f33.6807a",
+        "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=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",
+        "comments": "",
+        "x": 3277.1667442321777,
+        "y": 6622.007710874081,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "998fc046.d68f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3154.7626609802246,
-        "y": 6563.746625423431,
-        "z": "565447bf.1f1598",
+        "x": 3110.4996452331543,
+        "y": 6552.007910251617,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "82534f84.1802c",
-                "fc515f97.dc4ef"
+                "540af8f6.c0c8e"
             ]
         ]
     },
     {
-        "id": "301d4b1.d1d96b4",
+        "id": "8dc96b01.474dd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3154.76273727417,
-        "y": 6616.746384143829,
-        "z": "565447bf.1f1598",
+        "x": 3110.4997215270996,
+        "y": 6605.007668972015,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "bec2c422.16f948",
-                "fc515f97.dc4ef"
+                "64f21f33.6807a"
             ]
         ]
     },
     {
-        "id": "7666db3f.f47e74",
+        "id": "d83f3f7b.caadf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2997.929546356201,
-        "y": 6563.762295246124,
-        "z": "565447bf.1f1598",
+        "x": 2953.666530609131,
+        "y": 6552.02358007431,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f0c87b03.93a6b8"
+                "998fc046.d68f"
             ]
         ]
     },
     {
-        "id": "639b285f.08d4e8",
+        "id": "cc62185e.d573c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3006.501079559326,
-        "y": 6616.3814396858215,
-        "z": "565447bf.1f1598",
+        "x": 2962.238063812256,
+        "y": 6604.642724514008,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "301d4b1.d1d96b4"
+                "8dc96b01.474dd"
             ]
         ]
     },
     {
-        "id": "f138f006.e2934",
+        "id": "2ff95408.117534",
         "type": "switchNode",
         "name": "switch network-roles match?",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role\n  == $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].vnfc-network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2344.5962867736816,
-        "y": 6268.762328624725,
-        "z": "565447bf.1f1598",
+        "x": 2300.3332710266113,
+        "y": 6257.023613452911,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "96bf85f6.f873f8"
+                "9475b87c.2a043"
             ]
         ]
     },
     {
-        "id": "96bf85f6.f873f8",
+        "id": "9475b87c.2a043",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2531.2631301879883,
-        "y": 6268.762815952301,
-        "z": "565447bf.1f1598",
+        "x": 2487.000114440918,
+        "y": 6257.024100780487,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "14599bc4.dfcff4"
+                "35f11c05.060024"
             ]
         ]
     },
     {
-        "id": "2dbd930d.06759c",
+        "id": "6947a958.cfef3",
         "type": "switchNode",
         "name": "switch network-roles match?",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role\n  == $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].vnfc-network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2341.262866973877,
-        "y": 6590.429069042206,
-        "z": "565447bf.1f1598",
+        "x": 2296.9998512268066,
+        "y": 6578.690353870392,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "75bae1b8.8d5a7"
+                "e7b53b25.79cf28"
             ]
         ]
     },
     {
-        "id": "75bae1b8.8d5a7",
+        "id": "e7b53b25.79cf28",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2527.9297103881836,
-        "y": 6590.4295563697815,
-        "z": "565447bf.1f1598",
+        "x": 2483.6666946411133,
+        "y": 6578.6908411979675,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6321a56a.de355c"
+                "8da01247.1c11d8"
             ]
         ]
     },
     {
-        "id": "14b5c458.f3a9ec",
+        "id": "2376b6f4.a8ed0a",
         "type": "comment",
         "name": "SELF-SERVE FORK",
         "info": "",
         "comments": "",
-        "x": 710.9773101806641,
-        "y": 878.7863397598267,
-        "z": "565447bf.1f1598",
+        "x": 666.7142944335938,
+        "y": 867.0476245880127,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "efcbebcc.14464",
+        "type": "call",
+        "name": "call self-serve-vf-module-assign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1199.749439239502,
+        "y": 911.964430809021,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "971d6518.2083a"
+            ]
+        ]
+    },
+    {
+        "id": "4f6ca91d.20b5c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 1583.820816040039,
+        "y": 911.9643812179565,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "971d6518.2083a",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1420.047019958496,
+        "y": 911.4524621963501,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "4f6ca91d.20b5c"
+            ]
+        ]
+    },
+    {
+        "id": "d92c2968.bb747",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+        "comments": "",
+        "x": 1146.6186828613281,
+        "y": 1061.809350013733,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "b4ce17c3.fa50b8",
+        "id": "c5876c75.baaed",
+        "type": "execute",
+        "name": "printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1138.6662254333496,
+        "y": 1016.3008937835693,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "be93c800.e962c8",
+        "type": "set",
+        "name": "set order-status to PendingCreate",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\n",
+        "comments": "",
+        "x": 1209.3567428588867,
+        "y": 965.2617883682251,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "3eddc68c.a493ea",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 920.4521713256836,
+        "y": 911.6425924301147,
+        "z": "112fab3d.a10d2d",
+        "wires": [
+            [
+                "efcbebcc.14464",
+                "be93c800.e962c8",
+                "c5876c75.baaed",
+                "d92c2968.bb747"
+            ]
+        ]
+    },
+    {
+        "id": "8086d3c6.2981",
         "type": "comment",
         "name": "First, count the subnets for this address family",
         "info": "",
         "comments": "",
-        "x": 2706.2634239196777,
-        "y": 3201.7384843826294,
-        "z": "565447bf.1f1598",
+        "x": 2662.0004081726074,
+        "y": 3189.9997692108154,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "12c26bf4.a2a7c4",
+        "id": "fd0458e9.351b28",
         "type": "for",
         "name": "for each subnet-data",
         "xml": "<for index='subnet-data-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3079.5961112976074,
-        "y": 3496.7389879226685,
-        "z": "565447bf.1f1598",
+        "x": 3035.333095550537,
+        "y": 3485.0002727508545,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6a0e881b.4ba548"
+                "9c5ef8eb.9a7678"
             ]
         ]
     },
     {
-        "id": "6a0e881b.4ba548",
+        "id": "9c5ef8eb.9a7678",
         "type": "switchNode",
         "name": "address-families match?",
         "xml": "<switch test='`$tmp.address-family\n  == $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].ip-version`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3306.26273727417,
-        "y": 3496.7389879226685,
-        "z": "565447bf.1f1598",
+        "x": 3261.9997215270996,
+        "y": 3485.0002727508545,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "78272436.cd36bc"
+                "33f6db20.0ff7f4"
             ]
         ]
     },
     {
-        "id": "78272436.cd36bc",
+        "id": "33f6db20.0ff7f4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3486.2627029418945,
-        "y": 3496.7393941879272,
-        "z": "565447bf.1f1598",
+        "x": 3441.999687194824,
+        "y": 3485.0006790161133,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8571ff4f.7368d"
+                "54c3098c.899198"
             ]
         ]
     },
     {
-        "id": "f53353ba.f6cea",
+        "id": "ff243880.f35278",
         "type": "set",
         "name": "set af-count to 0",
         "xml": "<set>\n<parameter name='af-count' value='0' />\n",
         "comments": "",
-        "x": 2561.262996673584,
-        "y": 3243.4052362442017,
-        "z": "565447bf.1f1598",
+        "x": 2516.9999809265137,
+        "y": 3231.6665210723877,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "774c4dcf.519194",
+        "id": "38b83402.0da80c",
         "type": "set",
         "name": "increment af-count",
         "xml": "<set>\n<parameter name='af-count' value='`$af-count + 1`' />\n",
         "comments": "",
-        "x": 3309.596363067627,
-        "y": 3310.0719861984253,
-        "z": "565447bf.1f1598",
+        "x": 3265.3333473205566,
+        "y": 3298.3332710266113,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "d297a29d.32368",
+        "id": "788f6a84.68199c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3126.26273727417,
-        "y": 3291.7386713027954,
-        "z": "565447bf.1f1598",
+        "x": 3081.9997215270996,
+        "y": 3279.9999561309814,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "774c4dcf.519194",
-                "93d44f0.e06a8b"
+                "38b83402.0da80c",
+                "3fbd6c40.04a2bc"
             ]
         ]
     },
     {
-        "id": "93d44f0.e06a8b",
+        "id": "3fbd6c40.04a2bc",
         "type": "set",
         "name": "set subnet-id",
         "xml": "<set>\n<parameter name='subnet-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id`' />\n",
         "comments": "",
-        "x": 3291.262783050537,
-        "y": 3265.0719842910767,
-        "z": "565447bf.1f1598",
+        "x": 3246.999767303467,
+        "y": 3253.3332691192627,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "35326a6f.8ce8b6",
+        "id": "6cdf3e0.84820c4",
         "type": "switchNode",
         "name": "switch af-count",
         "xml": "<switch test='`$af-count`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2551.2634086608887,
-        "y": 3480.0721530914307,
-        "z": "565447bf.1f1598",
+        "x": 2507.0003929138184,
+        "y": 3468.3334379196167,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d300c477.7f84e8",
-                "8e745db4.433a4"
+                "a4b2346f.f87cb",
+                "33300284.96a34e"
             ]
         ]
     },
     {
-        "id": "d300c477.7f84e8",
+        "id": "a4b2346f.f87cb",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2711.262928009033,
-        "y": 3378.40532207489,
-        "z": "565447bf.1f1598",
+        "x": 2666.999912261963,
+        "y": 3366.666606903076,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "700167b.43daf98"
+                "ad8dd57b.16b9d"
             ]
         ]
     },
     {
-        "id": "700167b.43daf98",
+        "id": "ad8dd57b.16b9d",
         "type": "set",
         "name": "set subnet-id in vnfc-ip-assignments (temp variable)",
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id'\n  value='`$subnet-id`' />\n",
         "comments": "",
-        "x": 2984.59623336792,
-        "y": 3376.7386713027954,
-        "z": "565447bf.1f1598",
+        "x": 2940.3332176208496,
+        "y": 3364.9999561309814,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "8e745db4.433a4",
+        "id": "33300284.96a34e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2711.2628440856934,
-        "y": 3580.072241783142,
-        "z": "565447bf.1f1598",
+        "x": 2666.999828338623,
+        "y": 3568.333526611328,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "49b5ae7f.1ecb1"
+                "459f9c7c.facbf4"
             ]
         ]
     },
     {
-        "id": "49b5ae7f.1ecb1",
+        "id": "459f9c7c.facbf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2867.929485321045,
-        "y": 3580.0719232559204,
-        "z": "565447bf.1f1598",
+        "x": 2823.6664695739746,
+        "y": 3568.3332080841064,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "38e8e50c.e85dda",
-                "12c26bf4.a2a7c4",
-                "4e4fca65.cbf754",
-                "10262cd6.950543"
+                "ebf41120.205ed",
+                "fd0458e9.351b28",
+                "5250a99a.907d1",
+                "324552d3.28633e"
             ]
         ]
     },
     {
-        "id": "8571ff4f.7368d",
+        "id": "54c3098c.899198",
         "type": "switchNode",
         "name": "switch network-start-address",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].network-start-address`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3681.262882232666,
-        "y": 3495.072237968445,
-        "z": "565447bf.1f1598",
+        "x": 3636.9998664855957,
+        "y": 3483.333522796631,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dcdbaac8.71fac8",
-                "9a1f2d8c.38269"
+                "50f46a5d.151964",
+                "b4045616.46c1e"
             ]
         ]
     },
     {
-        "id": "dcdbaac8.71fac8",
+        "id": "50f46a5d.151964",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 3877.92972946167,
-        "y": 3430.071848630905,
-        "z": "565447bf.1f1598",
+        "x": 3833.6667137145996,
+        "y": 3418.333133459091,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "ff48f3fc.6ff7e"
+                "fa79e796.718bc"
             ]
         ]
     },
     {
-        "id": "9a1f2d8c.38269",
+        "id": "b4045616.46c1e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3871.0251274108887,
-        "y": 3564.3577601909637,
-        "z": "565447bf.1f1598",
+        "x": 3826.7621116638184,
+        "y": 3552.61904501915,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "f43b3822.b1c158"
+                "91359939.322c88"
             ]
         ]
     },
     {
-        "id": "f43b3822.b1c158",
+        "id": "91359939.322c88",
         "type": "switchNode",
         "name": "switch cidr-mask",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].cidr-mask`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4026.2629203796387,
-        "y": 3563.404967069626,
-        "z": "565447bf.1f1598",
+        "x": 3981.9999046325684,
+        "y": 3551.666251897812,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4eb745de.4f4aec",
-                "898134a0.ae5d18"
+                "fa078de2.dc1ae",
+                "21622a4.a2fe356"
             ]
         ]
     },
     {
-        "id": "4eb745de.4f4aec",
+        "id": "fa078de2.dc1ae",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 4181.262996673584,
-        "y": 3493.405266523361,
-        "z": "565447bf.1f1598",
+        "x": 4136.999980926514,
+        "y": 3481.6665513515472,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8dbb144d.370578"
+                "4d5413f9.62c7c4"
             ]
         ]
     },
     {
-        "id": "898134a0.ae5d18",
+        "id": "21622a4.a2fe356",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4184.358793258667,
-        "y": 3626.0243537425995,
-        "z": "565447bf.1f1598",
+        "x": 4140.095777511597,
+        "y": 3614.2856385707855,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "d34b6157.8f35a"
+                "62a4f148.c202c"
             ]
         ]
     },
     {
-        "id": "489d3614.0f27f8",
+        "id": "14889e9b.6b5371",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>",
         "comments": "",
         "outputs": 1,
-        "x": 2052.9296073913574,
-        "y": 3100.0719232559204,
-        "z": "565447bf.1f1598",
+        "x": 2008.666591644287,
+        "y": 3088.3332080841064,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8bb4c617.110b48"
+                "22b591c4.2e4326"
             ]
         ]
     },
     {
-        "id": "ff48f3fc.6ff7e",
+        "id": "82e555ca.39e4b",
+        "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=\"`'SDNC subnet id '\n      + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id\n      + ' does not have network-start-address populated'`\" />\n\n\n\n",
+        "comments": "",
+        "x": 4142.000217437744,
+        "y": 3433.332970380783,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "fa79e796.718bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4022.929656982422,
-        "y": 3430.071615934372,
-        "z": "565447bf.1f1598",
+        "x": 3978.6666412353516,
+        "y": 3418.332900762558,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "1b07cf87.9b6fe",
-                "f394576a.e4e1d8"
+                "82e555ca.39e4b",
+                "404dfa80.b1344c"
             ]
         ]
     },
     {
-        "id": "8dbb144d.370578",
+        "id": "926e57f0.46dc88",
+        "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=\"`'SDNC subnet id '\n      + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id\n      + ' does not have cidr-mask populated'`\" />\n\n\n\n",
+        "comments": "",
+        "x": 4447.000072479248,
+        "y": 3494.9998376369476,
+        "z": "112fab3d.a10d2d",
+        "wires": []
+    },
+    {
+        "id": "4d5413f9.62c7c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4327.929512023926,
-        "y": 3491.7384831905365,
-        "z": "565447bf.1f1598",
+        "x": 4283.6664962768555,
+        "y": 3479.9997680187225,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "319df706.15f388",
-                "f394576a.e4e1d8"
+                "926e57f0.46dc88",
+                "404dfa80.b1344c"
             ]
         ]
     },
     {
-        "id": "55e003a5.fca06c",
+        "id": "a6a5fc58.d573a",
         "type": "comment",
         "name": "Ignore address families with no addresses",
         "info": "",
         "comments": "",
-        "x": 2327.262981414795,
-        "y": 3030.4054193496704,
-        "z": "565447bf.1f1598",
+        "x": 2282.9999656677246,
+        "y": 3018.6667041778564,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "3291e6ae.85f8ba",
+        "id": "57662986.d12c8",
         "type": "switchNode",
         "name": "switch invariant-uuid",
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].invariant-uuid`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.9298210144043,
-        "y": 4660.071797370911,
-        "z": "565447bf.1f1598",
+        "x": 1253.666805267334,
+        "y": 4648.333082199097,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "6a6eb8f1.9f62d8",
-                "f080e271.42c9b"
+                "bca552ea.8dcc08",
+                "1bc6e4fe.e7fc03"
             ]
         ]
     },
     {
-        "id": "6a6eb8f1.9f62d8",
+        "id": "bca552ea.8dcc08",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1479.59623336792,
-        "y": 4636.73842716217,
-        "z": "565447bf.1f1598",
+        "x": 1435.3332176208496,
+        "y": 4624.999711990356,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "db88ee95.a44c3"
+                "e71566e3.c745c8"
             ]
         ]
     },
     {
-        "id": "f080e271.42c9b",
+        "id": "1bc6e4fe.e7fc03",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1477.691505432129,
-        "y": 4683.524254798889,
-        "z": "565447bf.1f1598",
+        "x": 1433.4284896850586,
+        "y": 4671.785539627075,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "9b23e63c.8ba5d8"
+                "ce29a815.f5683"
             ]
         ]
     },
     {
-        "id": "db88ee95.a44c3",
+        "id": "e71566e3.c745c8",
         "type": "save",
         "name": "save vnfc to A&AI",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vnfc\" \n\tkey=\"vnfc.vnfc-name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name\" >\n<parameter name=\"vnfc-name\" value=\"`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`\" />\n<parameter name=\"nfc-naming-code\" value=\"`$tmp.nfc-naming-code`\" />\n<parameter name=\"nfc-function\" value=\"`$tmp.nfc-function`\" />\n<parameter name=\"orchestration-status\" value=\"`PendingCreate`\" />\n<parameter name=\"in-maint\" value=\"true\" />\n<parameter name=\"prov-status\" value=\"`PREPROV`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1641.2628593444824,
-        "y": 4638.40541934967,
-        "z": "565447bf.1f1598",
+        "x": 1596.999843597412,
+        "y": 4626.666704177856,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "8c17d99f.3ce5f8",
-                "b50cee13.b9a08"
+                "b05fd296.8c44d8",
+                "9ce78c9c.21d2e"
             ]
         ]
     },
     {
-        "id": "d0321bc2.4f6358",
+        "id": "498f5a29.9e1ca4",
         "type": "switchNode",
         "name": "switch input cloud-owner",
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 576.9772109985352,
-        "y": 268.6434488296509,
-        "z": "565447bf.1f1598",
+        "x": 532.7141952514648,
+        "y": 256.9047336578369,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "da47b7e7.f3d848",
-                "23870b6f.901aa4"
+                "93f5de2c.13776",
+                "5d086485.c917c4"
             ]
         ]
     },
     {
-        "id": "da47b7e7.f3d848",
+        "id": "93f5de2c.13776",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 760.3105850219727,
-        "y": 238.64343738555908,
-        "z": "565447bf.1f1598",
+        "x": 716.0475692749023,
+        "y": 226.90472221374512,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "4f66f95.7b33f08"
+                "201ec95d.e95dfe"
             ]
         ]
     },
     {
-        "id": "23870b6f.901aa4",
+        "id": "5d086485.c917c4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 760.0724906921387,
-        "y": 279.5959310531616,
-        "z": "565447bf.1f1598",
+        "x": 715.8094749450684,
+        "y": 267.85721588134766,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "dee18ffa.a6fe6"
+                "404d471f.ff2ab"
             ]
         ]
     },
     {
-        "id": "4f66f95.7b33f08",
+        "id": "201ec95d.e95dfe",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 895.3105392456055,
-        "y": 236.9767770767212,
-        "z": "565447bf.1f1598",
+        "x": 851.0475234985352,
+        "y": 225.23806190490723,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "dee18ffa.a6fe6",
+        "id": "404d471f.ff2ab",
         "type": "set",
         "name": "set prop.cloud-region.cloud-owner",
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\n",
         "comments": "",
-        "x": 976.9771957397461,
-        "y": 278.64345836639404,
-        "z": "565447bf.1f1598",
+        "x": 932.7141799926758,
+        "y": 266.9047431945801,
+        "z": "112fab3d.a10d2d",
         "wires": []
     },
     {
-        "id": "348782c.04c017e",
+        "id": "f0c546c1.be6dc",
         "type": "call",
         "name": "call self-serve-vf-module-forking-logic",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-forking-logic' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 608.564582824707,
-        "y": 820.0367794036865,
-        "z": "565447bf.1f1598",
+        "x": 564.3015670776367,
+        "y": 808.2980642318726,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     },
     {
-        "id": "bceb88ad.260758",
+        "id": "40af7b28.67ea64",
         "type": "switchNode",
         "name": "switch ss.self-serve-flag",
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 566.7073211669922,
-        "y": 1047.0368480682373,
-        "z": "565447bf.1f1598",
+        "x": 522.4443054199219,
+        "y": 1035.2981328964233,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "7c55f766.ae1538",
-                "c5c4e1ec.02a4b"
+                "6edbe4f3.864dc4",
+                "bb5f378d.ec1c2"
             ]
         ]
     },
     {
-        "id": "7c55f766.ae1538",
+        "id": "6edbe4f3.864dc4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 787.4215202331543,
-        "y": 1164.607747077942,
-        "z": "565447bf.1f1598",
+        "x": 743.158504486084,
+        "y": 1152.869031906128,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "94a28d82.4f01d"
+                "72f655d6.4f3d74"
             ]
         ]
     },
     {
-        "id": "c5c4e1ec.02a4b",
+        "id": "bb5f378d.ec1c2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 787.9929733276367,
-        "y": 923.4653844833374,
-        "z": "565447bf.1f1598",
+        "x": 743.7299575805664,
+        "y": 911.7266693115234,
+        "z": "112fab3d.a10d2d",
         "wires": [
             [
-                "3d2fe671.10512a"
+                "3eddc68c.a493ea"
             ]
         ]
     },
     {
-        "id": "42e09bf7.400e44",
+        "id": "69eb61e5.2ebc48",
         "type": "call",
         "name": "call check for VNF-API-preload and copy",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='gw-vfmodule-update' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 517.2630157470703,
-        "y": 7248.738715171814,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3e5eb577.046eda",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 942.5129776000977,
-        "y": 397.6189908981323,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "6514e137.563f3",
-                "37049c8a.e3e5e4"
-            ]
-        ]
-    },
-    {
-        "id": "37049c8a.e3e5e4",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1130.4296607971191,
-        "y": 381.2499690055847,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2172bacb.fd1c86",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1044.7152824401855,
-        "y": 446.10708475112915,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "b1597171.3ee09",
-                "6514e137.563f3"
-            ]
-        ]
-    },
-    {
-        "id": "b1597171.3ee09",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1242.0366859436035,
-        "y": 424.64278411865234,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c639de59.ae251",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1059.0009880065918,
-        "y": 491.2499375343323,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "e497f95d.3eb3c8",
-                "6514e137.563f3"
-            ]
-        ]
-    },
-    {
-        "id": "e497f95d.3eb3c8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1253.6438751220703,
-        "y": 468.21422386169434,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dbfaf511.5478b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1020.6082458496094,
-        "y": 619.321418762207,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "2e3d6663.deaf6a",
-                "6514e137.563f3"
-            ]
-        ]
-    },
-    {
-        "id": "2e3d6663.deaf6a",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"There are no VNFs defined in MD-SAL\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1227.5725021362305,
-        "y": 590.3571434020996,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "792ace51.b15ed",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 884.8939514160156,
-        "y": 727.321418762207,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "63dc2a33.a12634",
-                "6514e137.563f3"
-            ]
-        ]
-    },
-    {
-        "id": "63dc2a33.a12634",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1086.8582458496094,
-        "y": 702.6785879135132,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "11136e46.5af982",
-        "type": "call",
-        "name": "call self-serve-vf-module-assign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1209.845615386963,
-        "y": 836.09494972229,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "cab143b7.d90eb"
-            ]
-        ]
-    },
-    {
-        "id": "cab143b7.d90eb",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1430.143196105957,
-        "y": 835.5829811096191,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "dbc9bb02.023fe8"
-            ]
-        ]
-    },
-    {
-        "id": "6a1554d7.38e2ec",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 1160.0483016967773,
-        "y": 1022.6065921783447,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "763275a1.1cfcbc",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1148.7624969482422,
-        "y": 927.0981254577637,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7a9afeeb.bcc87",
-        "type": "set",
-        "name": "set order-status to PendingCreate",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.order-status'\n  value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\n  value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\n  value='`$vf-module-topology-operation-input.request-information.request-action`' />\n",
-        "comments": "",
-        "x": 1217.7862586975098,
-        "y": 881.0589790344238,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "3d2fe671.10512a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 958.8817291259766,
-        "y": 922.5588111877441,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "11136e46.5af982",
-                "7a9afeeb.bcc87",
-                "763275a1.1cfcbc",
-                "6a1554d7.38e2ec",
-                "b7b50f72.60d66"
-            ]
-        ]
-    },
-    {
-        "id": "47186afb.be4274",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 1858.6439666748047,
-        "y": 1109.7859296798706,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "d4a9c0d.ac6c54",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1878.0030136108398,
-        "y": 1061.5854063034058,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6514e137.563f3",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1665.3107528686523,
-        "y": 1082.6432723999023,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "d4a9c0d.ac6c54",
-                "47186afb.be4274"
-            ]
-        ]
-    },
-    {
-        "id": "dbc9bb02.023fe8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1576.1439208984375,
-        "y": 834.9643363952637,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "1b79c9d4.553d96",
-                "6514e137.563f3"
-            ]
-        ]
-    },
-    {
-        "id": "1b79c9d4.553d96",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1773.8226776123047,
-        "y": 814.2500457763672,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b7b50f72.60d66",
-        "type": "configure",
-        "name": "send success to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"200\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1183.524787902832,
-        "y": 973.2976303100586,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "88ef43cf.4353c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id\n       + ' already exists, and status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2461.263038635254,
-        "y": 1377.207555770874,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cdf91b0.174e5e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2267.334129333496,
-        "y": 1396.6718444824219,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "88ef43cf.4353c",
-                "80b5ab3d.6f3ef8"
-            ]
-        ]
-    },
-    {
-        "id": "799eaa32.6fe824",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 972.334358215332,
-        "y": 1614.3384866714478,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "9ddd96ce.6586c8",
-                "80b5ab3d.6f3ef8"
-            ]
-        ]
-    },
-    {
-        "id": "7adbe623.7575f8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 974.0010452270508,
-        "y": 1657.6718606948853,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "22247b5.eb10384",
-                "80b5ab3d.6f3ef8"
-            ]
-        ]
-    },
-    {
-        "id": "9ddd96ce.6586c8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Cloud region not found in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1176.2630233764648,
-        "y": 1591.1242628097534,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "22247b5.eb10384",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving cloud region from AAI.  Is AAI down?\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1171.6797637939453,
-        "y": 1639.4575996398926,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ec2aeced.650af",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 856.9175720214844,
-        "y": 1838.3385391235352,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "9bc214de.5d73d8",
-                "80b5ab3d.6f3ef8"
-            ]
-        ]
-    },
-    {
-        "id": "9bc214de.5d73d8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1049.5962295532227,
-        "y": 1811.1242694854736,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "52d1a63d.f33e98",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 1823.1676559448242,
-        "y": 2106.4220657348633,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "373b7d02.755bd2",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1842.5267028808594,
-        "y": 2058.2215423583984,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "80b5ab3d.6f3ef8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1669.8344421386719,
-        "y": 2079.279408454895,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "373b7d02.755bd2",
-                "52d1a63d.f33e98"
-            ]
-        ]
-    },
-    {
-        "id": "8c6eb005.385ba",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2766.262939453125,
-        "y": 2577.512939453125,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "836cff6b.d0abc",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 2592.6909942626953,
-        "y": 2664.6557807922363,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "49c9b767.f94008",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2612.050117492676,
-        "y": 2621.4552307128906,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "76721fa9.6f7a7",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2376.0244140625,
-        "y": 2622.9297399520874,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "49c9b767.f94008",
-                "836cff6b.d0abc",
-                "8c6eb005.385ba"
-            ]
-        ]
-    },
-    {
-        "id": "c1b24090.d49b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2944.59623336792,
-        "y": 2278.2630882263184,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "ecc636c8.71fe78",
-                "76721fa9.6f7a7"
-            ]
-        ]
-    },
-    {
-        "id": "ecc636c8.71fe78",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'from-preload flag is true but could not find preload information for VF module name ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-name`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3144.179473876953,
-        "y": 2244.906032562256,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d759206d.14388",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2116.5007858276367,
-        "y": 2425.8463954925537,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "64958d02.cd8064",
-                "76721fa9.6f7a7"
-            ]
-        ]
-    },
-    {
-        "id": "64958d02.cd8064",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving preload-information\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2322.512893676758,
-        "y": 2400.4891319274902,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8af4f32.673261",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4188.346412658691,
-        "y": 4429.735001564026,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "693bee93.63734",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 4014.7744674682617,
-        "y": 4516.877842903137,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "e9b2b1c.191285",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4034.133590698242,
-        "y": 4473.6772928237915,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f394576a.e4e1d8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3798.1078872680664,
-        "y": 4475.151802062988,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "e9b2b1c.191285",
-                "693bee93.63734",
-                "8af4f32.673261"
-            ]
-        ]
-    },
-    {
-        "id": "a6ff636a.1da36",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'VNFC network role '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-network-role\n      + ' is not found in VNF network list'\n      `\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1884.5963439941406,
-        "y": 2909.4576473236084,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1b07cf87.9b6fe",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'SDNC subnet id '\n      + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id\n      + ' does not have network-start-address populated'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4214.179832458496,
-        "y": 3385.15172457695,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "319df706.15f388",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'SDNC subnet id '\n      + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id\n      + ' does not have cidr-mask populated'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4529.17985534668,
-        "y": 3462.651731491089,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fec2cbd9.e930a8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Not able to find VNF network subnet that contains address '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[0].vnfc-ip-address\n      `\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 3576.6798095703125,
-        "y": 3582.6517486572266,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6c1ed4b9.5ecf9c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VFC_RELATED_NETWORK_ROLE table\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2017.3740615844727,
-        "y": 3819.1801166534424,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4102f097.0a51",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find related network '\n      + $db.vnf-related-network-role[$db-related-network-index].related-network-role + ' in vnf-networks'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2824.874122619629,
-        "y": 4004.179864883423,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "30bee8c0.434ad8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error saving vnfc to AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2201.262969970703,
-        "y": 4626.819506645203,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "52bc7cef.ddfa64",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3674.318702697754,
-        "y": 5786.819993019104,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "69731c78.07bf64",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 3500.746757507324,
-        "y": 5873.962834358215,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "d37e8680.20ae98",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3520.1058807373047,
-        "y": 5830.76228427887,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1254304a.7d8a4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3284.080177307129,
-        "y": 5832.236793518066,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "d37e8680.20ae98",
-                "69731c78.07bf64",
-                "52bc7cef.ddfa64"
-            ]
-        ]
-    },
-    {
-        "id": "17b97fa6.0b332",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating vnfc relationships in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1838.6043319702148,
-        "y": 4740.568719863892,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "43b53fc.f18d2c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Not-found error updating vnfc relationships\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1838.0686531066895,
-        "y": 4797.5332860946655,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b0761ca.5d4cce",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error saving cp object to AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2280.5686626434326,
-        "y": 4966.8189868927,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "64e7c13b.82899",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2935.5687255859375,
-        "y": 5419.041241645813,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f4e9414e.c0a39",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating cp relationship to l3-network\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2938.0687255859375,
-        "y": 5481.541244506836,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "94072bfe.632c28",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network and vlan-tag in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3266.6403274536133,
-        "y": 5579.041257858276,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4462ce4a.8f7a5",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating cp relationship to l3-network and vlan-tag\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3269.140426635742,
-        "y": 5641.541258811951,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cc682bd5.2eb5c8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error creating l3-interface-ipv4-address-list object in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3958.4860305786133,
-        "y": 5050.291213989258,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1499e507.42f6db",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv4-address-list relationships in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3955.9860305786133,
-        "y": 5129.041219711304,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dac8db15.74e098",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating l3-interface-ipv4-address-list relationships\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3958.4857635498047,
-        "y": 5189.041226387024,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "97323f99.6212d",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error creating l3-interface-ipv6-address-list object in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3962.235771179199,
-        "y": 5239.0412311553955,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2f312957.2b15e6",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv6-address-list relationships in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3960.9855041503906,
-        "y": 5300.2912340164185,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9f878bec.0f8958",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating l3-interface-ipv6-address-list relationships\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3962.2355041503906,
-        "y": 5360.291234970093,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f60ef6eb.870138",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4378.4853515625,
-        "y": 5441.541015625,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5def6410.67b11c",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 4204.91340637207,
-        "y": 5528.683856964111,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "bbbbfcd1.e0cbe",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4224.272529602051,
-        "y": 5485.483306884766,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "11d81f8a.7859d",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3988.246826171875,
-        "y": 5486.957816123962,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "bbbbfcd1.e0cbe",
-                "5def6410.67b11c",
-                "f60ef6eb.870138"
-            ]
-        ]
-    },
-    {
-        "id": "dccafd0f.1af91",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3795.707374572754,
-        "y": 6904.735330581665,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fb57099e.c08198",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 3622.135429382324,
-        "y": 6991.878171920776,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "2f2cede4.19f362",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3641.4945526123047,
-        "y": 6948.677621841431,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fc515f97.dc4ef",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3405.468849182129,
-        "y": 6950.152131080627,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "2f2cede4.19f362",
-                "fb57099e.c08198",
-                "dccafd0f.1af91"
-            ]
-        ]
-    },
-    {
-        "id": "bec2c422.16f948",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3345.7076454162598,
-        "y": 6589.735626220703,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "82534f84.1802c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3339.4579162597656,
-        "y": 6525.98616027832,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9ebbd632.ef43d8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3350.707649230957,
-        "y": 6277.235605239868,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1a54f803.3243e8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3350.7079162597656,
-        "y": 6215.986141204834,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "41362899.a075b8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv6-address-list relationships\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718.2076110839844,
-        "y": 6477.23561668396,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9303413c.a15fb",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv6-address-list relationships in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2716.95760345459,
-        "y": 6419.736152648926,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dc08e935.aa2128",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error saving vip-ipv6-address-list\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2380.707588195801,
-        "y": 6363.485609054565,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ec585839.cf03a8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error saving vip-ipv6-address-list in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2380.707588195801,
-        "y": 6309.7356061935425,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8d6accf1.493c8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationships\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2726.957607269287,
-        "y": 6152.235597610474,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "38cb90b2.4e39c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationships in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2728.2076110839844,
-        "y": 6094.735593795776,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "34a07ec7.5c1d72",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error saving vip-ipv4-address-list\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2384.457588195801,
-        "y": 6050.985589981079,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d7673076.3ac06",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error saving vip-ipv4-address-list in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2380.707588195801,
-        "y": 5983.485586166382,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e64793d7.bf627",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No l3-network found in AAI for network ID '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1878.2075538635254,
-        "y": 5908.485583305359,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a1d9fe5d.0f695",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vf-module relationships in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1879.4575500488281,
-        "y": 5849.735575199127,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "18d43b0c.816ff5",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vf-module in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1031.2630081176758,
-        "y": 4280.569283485413,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d3b91e2a.6658a",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n    <parameter name=\"error-message\" value=\"`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1035.0130081176758,
-        "y": 4356.819286346436,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e283e90a.9eb6c8",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 408.58638763427734,
-        "y": 7559.698265075684,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d9542f83.7d0bb",
-        "type": "execute",
-        "name": "execute RestApiCallNode - PUT vf-module",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + 'vf-module-assign.json'`\" />\n    <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.vf-module.url`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"vf-module-assign\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 510.91951751708984,
-        "y": 7418.897064208984,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "f3d88006.1d825",
-                "a685bcd2.6458d"
-            ]
-        ]
-    },
-    {
-        "id": "f3d88006.1d825",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 786.7036972045898,
-        "y": 7439.593224525452,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "193e6953.109c97"
-            ]
-        ]
-    },
-    {
-        "id": "a685bcd2.6458d",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 779.1323318481445,
-        "y": 7398.093244552612,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "193e6953.109c97"
-            ]
-        ]
-    },
-    {
-        "id": "193e6953.109c97",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 988.062442779541,
-        "y": 7418.262205123901,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "d6c7309a.4a629",
-                "ddd8fcd8.b0fa8"
-            ]
-        ]
-    },
-    {
-        "id": "4f53e7be.5b9088",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1738.5627899169922,
-        "y": 7537.930374145508,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fe573c32.97a3b",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 1564.9908447265625,
-        "y": 7625.073215484619,
-        "z": "565447bf.1f1598",
-        "wires": []
-    },
-    {
-        "id": "3787f4fd.d2be6c",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1584.349967956543,
-        "y": 7581.872665405273,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ddd8fcd8.b0fa8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1367.6099700927734,
-        "y": 7582.454313278198,
-        "z": "565447bf.1f1598",
-        "wires": [
-            [
-                "3787f4fd.d2be6c",
-                "fe573c32.97a3b",
-                "4f53e7be.5b9088"
-            ]
-        ]
-    },
-    {
-        "id": "d6c7309a.4a629",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error doing PUT of vf-module\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1192.562858581543,
-        "y": 7390.787219047546,
-        "z": "565447bf.1f1598",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "50d368a6.9adce8",
-        "type": "configure",
-        "name": "send success to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"200\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 439.32460021972656,
-        "y": 7604.850353240967,
-        "z": "565447bf.1f1598",
+        "x": 473,
+        "y": 7237,
+        "z": "112fab3d.a10d2d",
         "wires": [
             []
         ]
     }
-]
-\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json
deleted file mode 100644
index b8b048ce..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-async.json
+++ /dev/null
@@ -1,295 +0,0 @@
-[
-    {
-        "id": "58cdaf8e.9338",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 179.8363037109375,
-        "y": 167.77080249786377,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "b5c33869.bb8148"
-            ]
-        ]
-    },
-    {
-        "id": "b5c33869.bb8148",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 293.12200927734375,
-        "y": 208.00891399383545,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "34177c3d.1d3d04"
-            ]
-        ]
-    },
-    {
-        "id": "34177c3d.1d3d04",
-        "type": "method",
-        "name": "method vf-module-topology-operation-async",
-        "xml": "<method rpc='vf-module-topology-operation-async' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 314.7649230957031,
-        "y": 266.520809173584,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "98c85507.862c28"
-            ]
-        ]
-    },
-    {
-        "id": "4dff986d.cfbfe8",
-        "type": "comment",
-        "name": "vf-module-topology-operation-async",
-        "info": "",
-        "comments": "",
-        "x": 642.9311599731445,
-        "y": 132.85714530944824,
-        "z": "720e27e0.e78d88",
-        "wires": []
-    },
-    {
-        "id": "98c85507.862c28",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 637.7291793823242,
-        "y": 419.98814606666565,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "9c9f62a6.868f5",
-                "2c41085c.8dd918",
-                "ccddbe0b.ddbca"
-            ]
-        ]
-    },
-    {
-        "id": "9c9f62a6.868f5",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 842.038688659668,
-        "y": 627.2950584888458,
-        "z": "720e27e0.e78d88",
-        "wires": []
-    },
-    {
-        "id": "2c41085c.8dd918",
-        "type": "switchNode",
-        "name": "switch svc-action",
-        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 848.6575927734375,
-        "y": 419.1517460346222,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "d8c68316.b7a72",
-                "b525dffc.024fb"
-            ]
-        ]
-    },
-    {
-        "id": "d8c68316.b7a72",
-        "type": "outcome",
-        "name": "assign",
-        "xml": "<outcome value='assign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1062.419563293457,
-        "y": 309.4375765323639,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "45cc9d2f.beb9b4"
-            ]
-        ]
-    },
-    {
-        "id": "93f4bc38.a3c71",
-        "type": "outcome",
-        "name": "unassign",
-        "xml": "<outcome value='unassign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1162.0505981445312,
-        "y": 459.37825417518616,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "d491d98.b65f128"
-            ]
-        ]
-    },
-    {
-        "id": "b525dffc.024fb",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1062.514804840088,
-        "y": 551.8183891773224,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "90ef12c9.0fcde"
-            ]
-        ]
-    },
-    {
-        "id": "90ef12c9.0fcde",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
-        "comments": "",
-        "x": 1256.7052307128906,
-        "y": 551.8184578418732,
-        "z": "720e27e0.e78d88",
-        "wires": []
-    },
-    {
-        "id": "45cc9d2f.beb9b4",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1434.5623970031738,
-        "y": 309.0090410709381,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dffe0c9b.30a7e",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1537.8124046325684,
-        "y": 409.42566990852356,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d491d98.b65f128",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1532.1456756591797,
-        "y": 459.09238934516907,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "516083ba.09ae5c",
-        "type": "outcome",
-        "name": "deactivate",
-        "xml": "<outcome value='deactivate'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1166.1456909179688,
-        "y": 410.0923435688019,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "dffe0c9b.30a7e"
-            ]
-        ]
-    },
-    {
-        "id": "9428c2a3.733a6",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1530.2886505126953,
-        "y": 360.33031582832336,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a8ae8c.55933178",
-        "type": "outcome",
-        "name": "activate",
-        "xml": "<outcome value='activate'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1158.2886352539062,
-        "y": 360.99699330329895,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "9428c2a3.733a6"
-            ]
-        ]
-    },
-    {
-        "id": "116260cc.9bfbcf",
-        "type": "outcome",
-        "name": "changeassign",
-        "xml": "<outcome value='changeassign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1176.622013092041,
-        "y": 506.9969837665558,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            [
-                "58e3fa70.7e8074"
-            ]
-        ]
-    },
-    {
-        "id": "58e3fa70.7e8074",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1545.717082977295,
-        "y": 506.711119890213,
-        "z": "720e27e0.e78d88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ccddbe0b.ddbca",
-        "type": "set",
-        "name": "set skip-mdsal-update to Y",
-        "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
-        "comments": "",
-        "x": 885.8481788635254,
-        "y": 263.24700570106506,
-        "z": "720e27e0.e78d88",
-        "wires": []
-    }
-]
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
index 77425c86..f85ff1a7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "146a644a.d6018c",
+        "id": "7f94573d.1aa9b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 222.8720245361328,
-        "y": 125.72916412353516,
-        "z": "efc57676.46ecd8",
+        "x": 110,
+        "y": 57.413658142089844,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "18443a18.5bbe96"
+                "53bfc824.9a76c8"
             ]
         ]
     },
     {
-        "id": "18443a18.5bbe96",
+        "id": "53bfc824.9a76c8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1368 +22,1343 @@
         "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": 336.15773010253906,
-        "y": 165.96727561950684,
-        "z": "efc57676.46ecd8",
+        "x": 223.28570556640625,
+        "y": 97.65176963806152,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "8fc8d312.0addc"
+                "73e2a9e7.337db8"
             ]
         ]
     },
     {
-        "id": "8fc8d312.0addc",
+        "id": "73e2a9e7.337db8",
         "type": "method",
         "name": "method vf-module-topology-operation",
         "xml": "<method rpc='vf-module-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 310.30065155029297,
-        "y": 205.72915840148926,
-        "z": "efc57676.46ecd8",
+        "x": 197.42862701416016,
+        "y": 137.41365242004395,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "f83a31fb.c7ace"
+                "71975c08.e015c4"
             ]
         ]
     },
     {
-        "id": "805cedaf.9da98",
+        "id": "f37eed7c.56eaf8",
         "type": "comment",
         "name": "vf-module-topology-operation",
         "info": "",
         "comments": "",
-        "x": 540.2168579101562,
-        "y": 108.31550598144531,
-        "z": "efc57676.46ecd8",
+        "x": 427.34483337402344,
+        "y": 40,
+        "z": "493735c0.a952fc",
         "wires": []
     },
     {
-        "id": "f83a31fb.c7ace",
+        "id": "71975c08.e015c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 284.3720703125,
-        "y": 539.0893239974976,
-        "z": "efc57676.46ecd8",
+        "x": 179.50003814697266,
+        "y": 376.77383041381836,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "52ec0471.d31dec",
-                "2eeb234b.70f96c",
-                "fdb85777.d67288"
+                "c09887fc.d299f8",
+                "4926b9f5.ab5c7",
+                "f89252a4.af5fa"
             ]
         ]
     },
     {
-        "id": "52ec0471.d31dec",
+        "id": "c09887fc.d299f8",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 569.8720626831055,
-        "y": 712.5867128372192,
-        "z": "efc57676.46ecd8",
+        "x": 465.0000305175781,
+        "y": 550.27121925354,
+        "z": "493735c0.a952fc",
         "wires": []
     },
     {
-        "id": "2eeb234b.70f96c",
+        "id": "4926b9f5.ab5c7",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 580.7766723632812,
-        "y": 537.3005485534668,
-        "z": "efc57676.46ecd8",
+        "x": 475.9046401977539,
+        "y": 374.9850549697876,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e3a4fc2b.3161c",
-                "7f1f0b87.a516f4",
-                "3be366b6.d25b3a",
-                "e4340a.0ef46bf8",
-                "5a77a3cd.db513c",
-                "e3513758.067c58",
-                "49beeb56.f0ac24",
-                "1ed385fc.7370aa",
-                "bf807bcb.c76ab8"
+                "7d5db9d9.ad0e38",
+                "3bd4270d.a241e",
+                "c98ec688.2f486",
+                "1b25ba4e.75c82e",
+                "4d85225d.72c3cc",
+                "3ef68b65.7a1b4c",
+                "60b28642.cd3218",
+                "2e12e4fa.1580b4",
+                "b99c1f3f.e6afb"
             ]
         ]
     },
     {
-        "id": "e3a4fc2b.3161c",
+        "id": "7d5db9d9.ad0e38",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 792.2529525756836,
-        "y": 385.5864505767822,
-        "z": "efc57676.46ecd8",
+        "x": 685.3809204101562,
+        "y": 265.2708921432495,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e9421b98.811ad8"
+                "965ae23f.9fa918"
             ]
         ]
     },
     {
-        "id": "7f1f0b87.a516f4",
+        "id": "3bd4270d.a241e",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.6339378356934,
-        "y": 573.7770776748657,
-        "z": "efc57676.46ecd8",
+        "x": 693.761905670166,
+        "y": 411.4615840911865,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "af035a10.7be258"
+                "5bd2b2dc.3bca44"
             ]
         ]
     },
     {
-        "id": "3be366b6.d25b3a",
+        "id": "c98ec688.2f486",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 702.3482894897461,
-        "y": 1989.3007230758667,
-        "z": "efc57676.46ecd8",
+        "x": 597.4762573242188,
+        "y": 1826.9852294921875,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "fcd40c7c.89fc6"
+                "733f298.51afc58"
             ]
         ]
     },
     {
-        "id": "fcd40c7c.89fc6",
+        "id": "733f298.51afc58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 896.5387153625488,
-        "y": 1989.3007917404175,
-        "z": "efc57676.46ecd8",
+        "x": 791.6666831970215,
+        "y": 1826.9852981567383,
+        "z": "493735c0.a952fc",
         "wires": []
     },
     {
-        "id": "fdb85777.d67288",
+        "id": "f89252a4.af5fa",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vf-module-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 707.9553070068359,
-        "y": 283.11022090911865,
-        "z": "efc57676.46ecd8",
+        "x": 595.0832824707031,
+        "y": 214.79471492767334,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "f078e9a1.93f268",
+        "id": "965ae23f.9fa918",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1057.523754119873,
+        "y": 264.84235668182373,
+        "z": "493735c0.a952fc",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1324ee03.e7df4a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1174.3957443237305,
-        "y": 523.8244934082031,
-        "z": "efc57676.46ecd8",
+        "x": 1069.5237121582031,
+        "y": 361.5089998245239,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "af035a10.7be258",
+        "id": "5bd2b2dc.3bca44",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1168.7290153503418,
-        "y": 573.4912128448486,
-        "z": "efc57676.46ecd8",
+        "x": 1063.8569831848145,
+        "y": 411.17571926116943,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "b4bb85e8.cecf88",
+        "id": "4a3a38c7.8c78b",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 802.7290306091309,
-        "y": 524.4911670684814,
-        "z": "efc57676.46ecd8",
+        "x": 697.8569984436035,
+        "y": 362.17567348480225,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "f078e9a1.93f268"
+                "1324ee03.e7df4a"
             ]
         ]
     },
     {
-        "id": "e4340a.0ef46bf8",
+        "id": "1b25ba4e.75c82e",
         "type": "outcome",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 813.2053527832031,
-        "y": 621.3958072662354,
-        "z": "efc57676.46ecd8",
+        "x": 708.3333206176758,
+        "y": 459.08031368255615,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "c11d3f25.2b8ae"
+                "321153c2.713aac"
             ]
         ]
     },
     {
-        "id": "c11d3f25.2b8ae",
+        "id": "321153c2.713aac",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-changeassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.300422668457,
-        "y": 621.1099433898926,
-        "z": "efc57676.46ecd8",
+        "x": 1077.4283905029297,
+        "y": 458.7944498062134,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a77a3cd.db513c",
+        "id": "4d85225d.72c3cc",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.8720321655273,
-        "y": 819.729151725769,
-        "z": "efc57676.46ecd8",
+        "x": 694,
+        "y": 657.4136581420898,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "9fa3f7fb.d73818"
+                "a8c66c29.fddec8"
             ]
         ]
     },
     {
-        "id": "46363f16.60595",
+        "id": "fc31a6f4.807ee8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1037.2056350708008,
-        "y": 827.3155148923397,
-        "z": "efc57676.46ecd8",
+        "x": 932.3336029052734,
+        "y": 665.0000213086605,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "53511ac.d85bde4",
-                "60e100d5.7588f",
-                "41615e5f.e1751",
-                "e2244d87.5c338",
-                "a2058bc6.fa69e8",
-                "d0130bf2.6e3448"
+                "354f981.3fa2f68",
+                "8a95b3a4.ddc598",
+                "4d9a6033.5edfa8",
+                "864be42d.6bad08",
+                "b387cf37.df8cc",
+                "e0078c0f.b00658"
             ]
         ]
     },
     {
-        "id": "60e100d5.7588f",
+        "id": "8a95b3a4.ddc598",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1327.6819534301758,
-        "y": 735.7948837280273,
-        "z": "efc57676.46ecd8",
+        "x": 1222.8099212646484,
+        "y": 573.4793901443481,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "a917c65f.e5c2a8"
+                "683f2801.170988"
             ]
         ]
     },
     {
-        "id": "53511ac.d85bde4",
+        "id": "354f981.3fa2f68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1237.5864181518555,
-        "y": 911.1727781295776,
-        "z": "efc57676.46ecd8",
+        "x": 1132.7143859863281,
+        "y": 748.8572845458984,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "de8a37a9.53a558"
+                "b57a7e92.19b9a"
             ]
         ]
     },
     {
-        "id": "9fa3f7fb.d73818",
+        "id": "a8c66c29.fddec8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 985.2055511474609,
-        "y": 747.3155164718628,
-        "z": "efc57676.46ecd8",
+        "x": 880.3335189819336,
+        "y": 585.0000228881836,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "46363f16.60595",
-                "976fd046.7fe32"
+                "fc31a6f4.807ee8",
+                "47960a97.91ab8c"
             ]
         ]
     },
     {
-        "id": "a917c65f.e5c2a8",
+        "id": "683f2801.170988",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751.205825805664,
-        "y": 734.3156599998474,
-        "z": "efc57676.46ecd8",
+        "x": 1646.3337936401367,
+        "y": 572.0001664161682,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "de8a37a9.53a558",
+        "id": "b57a7e92.19b9a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1390.8720703125,
-        "y": 911.2291746139526,
-        "z": "efc57676.46ecd8",
+        "x": 1286.0000381469727,
+        "y": 748.9136810302734,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "41615e5f.e1751",
+        "id": "4d9a6033.5edfa8",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1301.5388107299805,
-        "y": 869.562668800354,
-        "z": "efc57676.46ecd8",
+        "x": 1196.6667785644531,
+        "y": 707.2471752166748,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "dab1af07.8a3cf"
+                "f12da86a.70ee18"
             ]
         ]
     },
     {
-        "id": "dab1af07.8a3cf",
+        "id": "f12da86a.70ee18",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1774.0625076293945,
-        "y": 869.083420753479,
-        "z": "efc57676.46ecd8",
+        "x": 1669.1904754638672,
+        "y": 706.7679271697998,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e2244d87.5c338",
+        "id": "864be42d.6bad08",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1309.903133392334,
-        "y": 789.7606291770935,
-        "z": "efc57676.46ecd8",
+        "x": 1205.0311012268066,
+        "y": 627.4451355934143,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "99f05a55.3dafe8"
+                "50e37058.feb9b"
             ]
         ]
     },
     {
-        "id": "99f05a55.3dafe8",
+        "id": "50e37058.feb9b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1765.4269218444824,
-        "y": 789.2814984321594,
-        "z": "efc57676.46ecd8",
+        "x": 1660.554889678955,
+        "y": 626.9660048484802,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2058bc6.fa69e8",
+        "id": "b387cf37.df8cc",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1339.8720512390137,
-        "y": 688.7292037010193,
-        "z": "efc57676.46ecd8",
+        "x": 1235.0000190734863,
+        "y": 526.4137101173401,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "d2406569.cc26c8"
+                "965ad1aa.2d9608"
             ]
         ]
     },
     {
-        "id": "d2406569.cc26c8",
+        "id": "965ad1aa.2d9608",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1748.395824432373,
-        "y": 686.2499709129333,
-        "z": "efc57676.46ecd8",
+        "x": 1643.5237922668457,
+        "y": 523.9344773292542,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3513758.067c58",
+        "id": "3ef68b65.7a1b4c",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 788.8720321655273,
-        "y": 1015.0624647140503,
-        "z": "efc57676.46ecd8",
+        "x": 684,
+        "y": 852.7469711303711,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "b3da3524.611018"
+                "661b6cec.852cdc"
             ]
         ]
     },
     {
-        "id": "ad86b133.4fcef",
+        "id": "544c0912.e1e7",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1319.0150833129883,
-        "y": 1017.9614181518555,
-        "z": "efc57676.46ecd8",
+        "x": 1214.143051147461,
+        "y": 855.6459245681763,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "9fb362a8.709c"
+                "17e60c84.8e005b"
             ]
         ]
     },
     {
-        "id": "b3da3524.611018",
+        "id": "661b6cec.852cdc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 969.5388031005859,
-        "y": 1010.482141494751,
-        "z": "efc57676.46ecd8",
+        "x": 864.6667709350586,
+        "y": 848.1666479110718,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "6119c1c4.7dffd"
+                "d64d4fe2.5b9a28"
             ]
         ]
     },
     {
-        "id": "9fb362a8.709c",
+        "id": "17e60c84.8e005b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.5389709472656,
-        "y": 1011.4822006225586,
-        "z": "efc57676.46ecd8",
+        "x": 1626.6669387817383,
+        "y": 849.1667070388794,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "34c2f165.f848be",
+        "id": "3bf3bf04.d083f8",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1308.2055206298828,
-        "y": 1063.9822068214417,
-        "z": "efc57676.46ecd8",
+        "x": 1203.3334884643555,
+        "y": 901.6667132377625,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "51ba2675.c49818"
+                "6245ee1b.e1d3c"
             ]
         ]
     },
     {
-        "id": "51ba2675.c49818",
+        "id": "6245ee1b.e1d3c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1743.7292175292969,
-        "y": 1063.5029792785645,
-        "z": "efc57676.46ecd8",
+        "x": 1638.8571853637695,
+        "y": 901.1874856948853,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b3819e5.446868",
+        "id": "a7ddf2b7.d5012",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1742.2053451538086,
-        "y": 1148.9821610450745,
-        "z": "efc57676.46ecd8",
+        "x": 1637.3333129882812,
+        "y": 986.6666674613953,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8fb0712b.8a713",
+        "id": "4afd22ac.e5ea1c",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1306.6816482543945,
-        "y": 1149.4613885879517,
-        "z": "efc57676.46ecd8",
+        "x": 1201.8096160888672,
+        "y": 987.1458950042725,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "4b3819e5.446868"
+                "a7ddf2b7.d5012"
             ]
         ]
     },
     {
-        "id": "6119c1c4.7dffd",
+        "id": "d64d4fe2.5b9a28",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1045.8720321655273,
-        "y": 1077.0624647140503,
-        "z": "efc57676.46ecd8",
+        "x": 941,
+        "y": 914.7469711303711,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "ad86b133.4fcef",
-                "34c2f165.f848be",
-                "8fb0712b.8a713",
-                "d07f736.adfa09",
-                "481790e7.43aeb",
-                "c64a1b07.ab47a8"
+                "544c0912.e1e7",
+                "3bf3bf04.d083f8",
+                "4afd22ac.e5ea1c",
+                "66a81340.923bf4",
+                "66dc453c.fc1e54",
+                "6317efef.fce608"
             ]
         ]
     },
     {
-        "id": "d07f736.adfa09",
+        "id": "66a81340.923bf4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1238.4435119628906,
-        "y": 1198.273973941803,
-        "z": "efc57676.46ecd8",
+        "x": 1133.5714797973633,
+        "y": 1035.9584803581238,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e739bc83.63e2c"
+                "598c0313.5471bc"
             ]
         ]
     },
     {
-        "id": "481790e7.43aeb",
+        "id": "66dc453c.fc1e54",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1321.8720321655273,
-        "y": 973.0624647140503,
-        "z": "efc57676.46ecd8",
+        "x": 1217,
+        "y": 810.7469711303711,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e2bf4bd1.f5d2f8"
+                "21aac5f2.3ee152"
             ]
         ]
     },
     {
-        "id": "e2bf4bd1.f5d2f8",
+        "id": "21aac5f2.3ee152",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1737.3958358764648,
-        "y": 966.5832414627075,
-        "z": "efc57676.46ecd8",
+        "x": 1632.5238037109375,
+        "y": 804.2677478790283,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "49beeb56.f0ac24",
+        "id": "60b28642.cd3218",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.8720245361328,
-        "y": 1301.0625576972961,
-        "z": "efc57676.46ecd8",
+        "x": 667.9999923706055,
+        "y": 1138.747064113617,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "fb50cbbf.e98648"
+                "c83f7131.ad7d"
             ]
         ]
     },
     {
-        "id": "676bcbf6.bf2a24",
+        "id": "494e3a53.b269cc",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1311.0151443481445,
-        "y": 1300.9615278244019,
-        "z": "efc57676.46ecd8",
+        "x": 1206.1431121826172,
+        "y": 1138.6460342407227,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "2f3916a.390d7ea"
+                "6783e95d.0fc418"
             ]
         ]
     },
     {
-        "id": "fb50cbbf.e98648",
+        "id": "c83f7131.ad7d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 953.5387954711914,
-        "y": 1296.4822344779968,
-        "z": "efc57676.46ecd8",
+        "x": 848.6667633056641,
+        "y": 1134.1667408943176,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "8f3e573.51225a8"
+                "854cfeba.5c1998"
             ]
         ]
     },
     {
-        "id": "2f3916a.390d7ea",
+        "id": "6783e95d.0fc418",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728.5389099121094,
-        "y": 1302.4822645187378,
-        "z": "efc57676.46ecd8",
+        "x": 1623.666877746582,
+        "y": 1140.1667709350586,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6530296.821ac",
+        "id": "5a56c8ff.fdd22",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1292.2055130004883,
-        "y": 1349.9822998046875,
-        "z": "efc57676.46ecd8",
+        "x": 1187.333480834961,
+        "y": 1187.6668062210083,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "bb595a17.77c898"
+                "5670491c.f974d"
             ]
         ]
     },
     {
-        "id": "bb595a17.77c898",
+        "id": "5670491c.f974d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727.7292098999023,
-        "y": 1349.5030722618103,
-        "z": "efc57676.46ecd8",
+        "x": 1622.857177734375,
+        "y": 1187.187578678131,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "be737f8c.bf185",
+        "id": "37d4bd75.8979ea",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1725.205421447754,
-        "y": 1427.982274055481,
-        "z": "efc57676.46ecd8",
+        "x": 1620.3333892822266,
+        "y": 1265.6667804718018,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7297171e.80a088",
+        "id": "66db4ece.f7fd6",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1289.6817245483398,
-        "y": 1428.4615015983582,
-        "z": "efc57676.46ecd8",
+        "x": 1184.8096923828125,
+        "y": 1266.146008014679,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "be737f8c.bf185"
+                "37d4bd75.8979ea"
             ]
         ]
     },
     {
-        "id": "8f3e573.51225a8",
+        "id": "854cfeba.5c1998",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1029.8720245361328,
-        "y": 1363.0625576972961,
-        "z": "efc57676.46ecd8",
+        "x": 924.9999923706055,
+        "y": 1200.747064113617,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "676bcbf6.bf2a24",
-                "c6530296.821ac",
-                "7297171e.80a088",
-                "71d7e3b7.3e65fc",
-                "c02ae531.4d1c08",
-                "443330cd.1d373"
+                "494e3a53.b269cc",
+                "5a56c8ff.fdd22",
+                "66db4ece.f7fd6",
+                "c3ff1e72.3d8938",
+                "5aa69599.5bf6d4",
+                "b2250aab.0c69d8"
             ]
         ]
     },
     {
-        "id": "71d7e3b7.3e65fc",
+        "id": "c3ff1e72.3d8938",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1225.443458557129,
-        "y": 1478.2740640640259,
-        "z": "efc57676.46ecd8",
+        "x": 1120.5714263916016,
+        "y": 1315.9585704803467,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "e798a02b.bec1a"
+                "3b62d3d9.f8eab4"
             ]
         ]
     },
     {
-        "id": "c02ae531.4d1c08",
+        "id": "5aa69599.5bf6d4",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1305.8720245361328,
-        "y": 1259.0625576972961,
-        "z": "efc57676.46ecd8",
+        "x": 1200.9999923706055,
+        "y": 1096.747064113617,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "c1f94712.8e93d8"
+                "6252df01.3597a"
             ]
         ]
     },
     {
-        "id": "c1f94712.8e93d8",
+        "id": "6252df01.3597a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1721.3958282470703,
-        "y": 1252.5833344459534,
-        "z": "efc57676.46ecd8",
+        "x": 1616.523796081543,
+        "y": 1090.2678408622742,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e798a02b.bec1a",
+        "id": "3b62d3d9.f8eab4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1563.8721389770508,
-        "y": 1478.7292747497559,
-        "z": "efc57676.46ecd8",
+        "x": 1459.0001068115234,
+        "y": 1316.4137811660767,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e739bc83.63e2c",
+        "id": "598c0313.5471bc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1568.8720245361328,
-        "y": 1195.7291836738586,
-        "z": "efc57676.46ecd8",
+        "x": 1463.9999923706055,
+        "y": 1033.4136900901794,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "439fbd92.bc1ce4",
+        "id": "14afa7be.e27dc8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1166.8719902038574,
-        "y": 474.72913932800293,
-        "z": "efc57676.46ecd8",
+        "x": 1061.99995803833,
+        "y": 312.41364574432373,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "62a08c09.0b1384",
+        "id": "54e2eced.ad10ac",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 794.8719749450684,
-        "y": 475.3958168029785,
-        "z": "efc57676.46ecd8",
+        "x": 689.999942779541,
+        "y": 313.0803232192993,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "439fbd92.bc1ce4"
+                "14afa7be.e27dc8"
             ]
         ]
     },
     {
-        "id": "1ed385fc.7370aa",
+        "id": "2e12e4fa.1580b4",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.8720703125,
-        "y": 1646.3958864212036,
-        "z": "efc57676.46ecd8",
+        "x": 631.0000381469727,
+        "y": 1484.0803928375244,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "bca44a5d.cc37a8"
+                "33a7ef53.e934b"
             ]
         ]
     },
     {
-        "id": "bfb405f9.b31248",
+        "id": "ad2402bf.1c98f8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 975.2055892944336,
-        "y": 1646.982253074646,
-        "z": "efc57676.46ecd8",
+        "x": 870.3335571289062,
+        "y": 1484.6667594909668,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "425d435e.61bf0c",
-                "51fa15a4.dbc35c",
-                "7e86ba39.03f964",
-                "25d4d62c.6d980a",
-                "2a489103.e03f5e",
-                "21017d13.c62292"
+                "faba584.b26f228",
+                "5b627b00.db32b4",
+                "5681133e.5cc914",
+                "218e055.5ef2a7a",
+                "63c6c514.9c1dbc",
+                "f4308b39.a2e5b"
             ]
         ]
     },
     {
-        "id": "51fa15a4.dbc35c",
+        "id": "5b627b00.db32b4",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1260.6821365356445,
-        "y": 1580.4616527557373,
-        "z": "efc57676.46ecd8",
+        "x": 1155.8101043701172,
+        "y": 1418.146159172058,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "bd63c480.3e8d18"
+                "e5e26c94.b2c39"
             ]
         ]
     },
     {
-        "id": "425d435e.61bf0c",
+        "id": "faba584.b26f228",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1174.5864562988281,
-        "y": 1737.8395128250122,
-        "z": "efc57676.46ecd8",
+        "x": 1069.7144241333008,
+        "y": 1575.524019241333,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "9d6e36bc.fa16b8"
+                "d9cc9704.5b361"
             ]
         ]
     },
     {
-        "id": "bca44a5d.cc37a8",
+        "id": "33a7ef53.e934b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 922.2055892944336,
-        "y": 1573.9822511672974,
-        "z": "efc57676.46ecd8",
+        "x": 817.3335571289062,
+        "y": 1411.6667575836182,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "bfb405f9.b31248"
+                "ad2402bf.1c98f8"
             ]
         ]
     },
     {
-        "id": "bd63c480.3e8d18",
+        "id": "e5e26c94.b2c39",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1664.2057495117188,
-        "y": 1575.9824976921082,
-        "z": "efc57676.46ecd8",
+        "x": 1559.3337173461914,
+        "y": 1413.667004108429,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "9d6e36bc.fa16b8",
+        "id": "d9cc9704.5b361",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1327.8721084594727,
-        "y": 1737.8959093093872,
-        "z": "efc57676.46ecd8",
+        "x": 1223.0000762939453,
+        "y": 1575.580415725708,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e86ba39.03f964",
+        "id": "5681133e.5cc914",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1238.5388488769531,
-        "y": 1696.2294034957886,
-        "z": "efc57676.46ecd8",
+        "x": 1133.6668167114258,
+        "y": 1533.9139099121094,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "566c3117.8e406"
+                "fa693b23.6d7988"
             ]
         ]
     },
     {
-        "id": "566c3117.8e406",
+        "id": "fa693b23.6d7988",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1711.0625457763672,
-        "y": 1695.7501554489136,
-        "z": "efc57676.46ecd8",
+        "x": 1606.1905136108398,
+        "y": 1533.4346618652344,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "25d4d62c.6d980a",
+        "id": "218e055.5ef2a7a",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1262.9032440185547,
-        "y": 1619.42729139328,
-        "z": "efc57676.46ecd8",
+        "x": 1158.0312118530273,
+        "y": 1457.1117978096008,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "cac13dac.4d799"
+                "5a1a4f39.b559a8"
             ]
         ]
     },
     {
-        "id": "cac13dac.4d799",
+        "id": "5a1a4f39.b559a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.4270629882812,
-        "y": 1614.9481959342957,
-        "z": "efc57676.46ecd8",
+        "x": 1572.555030822754,
+        "y": 1452.6327023506165,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a489103.e03f5e",
+        "id": "63c6c514.9c1dbc",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1266.8721008300781,
-        "y": 1539.3959035873413,
-        "z": "efc57676.46ecd8",
+        "x": 1162.0000686645508,
+        "y": 1377.080410003662,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "a107ba80.f2c438"
+                "651c4a0c.4cbb5c"
             ]
         ]
     },
     {
-        "id": "a107ba80.f2c438",
+        "id": "651c4a0c.4cbb5c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1660.3959045410156,
-        "y": 1539.9166712760925,
-        "z": "efc57676.46ecd8",
+        "x": 1555.5238723754883,
+        "y": 1377.6011776924133,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "976fd046.7fe32",
+        "id": "47960a97.91ab8c",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"request-action\"/>\n<parameter name=\"field3\" value='`$vf-module-topology-operation-input.request-information.request-action`'/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.6220321655273,
-        "y": 696.3194011151791,
-        "z": "efc57676.46ecd8",
+        "x": 1021.75,
+        "y": 534.0039075314999,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d0130bf2.6e3448",
+        "id": "e0078c0f.b00658",
         "type": "outcome",
         "name": "CreateSDWANLanPortInstance",
         "xml": "<outcome value='CreateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1303.6155319213867,
-        "y": 830.569402217865,
-        "z": "efc57676.46ecd8",
+        "x": 1198.7434997558594,
+        "y": 668.2539086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "17a425c8.ef240a"
+                "4cf5d326.e70d2c"
             ]
         ]
     },
     {
-        "id": "17a425c8.ef240a",
+        "id": "4cf5d326.e70d2c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1776.1392288208008,
-        "y": 830.09015417099,
-        "z": "efc57676.46ecd8",
+        "x": 1671.2671966552734,
+        "y": 667.7746605873108,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c64a1b07.ab47a8",
+        "id": "6317efef.fce608",
         "type": "outcome",
         "name": "ActivateSDWANLanPortInstance",
         "xml": "<outcome value='ActivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1315.6155319213867,
-        "y": 1107.819402217865,
-        "z": "efc57676.46ecd8",
+        "x": 1210.7434997558594,
+        "y": 945.5039086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "a795142a.2e7d78"
+                "ad2dda1f.42803"
             ]
         ]
     },
     {
-        "id": "a795142a.2e7d78",
+        "id": "ad2dda1f.42803",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1733.1391830444336,
-        "y": 1107.3401637077332,
-        "z": "efc57676.46ecd8",
+        "x": 1628.2671508789062,
+        "y": 945.024670124054,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "443330cd.1d373",
+        "id": "b2250aab.0c69d8",
         "type": "outcome",
         "name": "DeactivateSDWANLanPortInstance",
         "xml": "<outcome value='DeactivateSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1301.6155319213867,
-        "y": 1394.069402217865,
-        "z": "efc57676.46ecd8",
+        "x": 1196.7434997558594,
+        "y": 1231.7539086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "10e14224.177fee"
+                "f7cfaeb8.3fd438"
             ]
         ]
     },
     {
-        "id": "10e14224.177fee",
+        "id": "f7cfaeb8.3fd438",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1719.1391830444336,
-        "y": 1393.5901637077332,
-        "z": "efc57676.46ecd8",
+        "x": 1614.2671508789062,
+        "y": 1231.274670124054,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "21017d13.c62292",
+        "id": "f4308b39.a2e5b",
         "type": "outcome",
         "name": "DeleteSDWANLanPortInstance",
         "xml": "<outcome value='DeleteSDWANLanPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1265.6155319213867,
-        "y": 1657.069402217865,
-        "z": "efc57676.46ecd8",
+        "x": 1160.7434997558594,
+        "y": 1494.7539086341858,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "bc4d8c28.5152b"
+                "98ff9895.6aef48"
             ]
         ]
     },
     {
-        "id": "bc4d8c28.5152b",
+        "id": "98ff9895.6aef48",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1683.1391830444336,
-        "y": 1656.5901637077332,
-        "z": "efc57676.46ecd8",
+        "x": 1578.2671508789062,
+        "y": 1494.274670124054,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "bf807bcb.c76ab8",
+        "id": "b99c1f3f.e6afb",
         "type": "outcome",
         "name": "update",
         "xml": "<outcome value='update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 706.8720321655273,
-        "y": 1785.3154935836792,
-        "z": "efc57676.46ecd8",
+        "x": 602,
+        "y": 1623,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "4bd24679.ac0638"
+                "c6d60a18.353d58"
             ]
         ]
     },
     {
-        "id": "4bd24679.ac0638",
+        "id": "c6d60a18.353d58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 881.2055282592773,
-        "y": 1789.9019804000854,
-        "z": "efc57676.46ecd8",
+        "x": 776.33349609375,
+        "y": 1627.5864868164062,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "677be846.dfdd88"
+                "ee329c14.143048"
             ]
         ]
     },
     {
-        "id": "677be846.dfdd88",
+        "id": "ee329c14.143048",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 1037.2055282592773,
-        "y": 1859.9019804000854,
-        "z": "efc57676.46ecd8",
+        "x": 932.33349609375,
+        "y": 1697.5864868164062,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "24961218.c1a6de",
-                "4da413d8.1ef91c"
+                "342f4246.9d954e",
+                "8235fd9d.7ee738"
             ]
         ]
     },
     {
-        "id": "24961218.c1a6de",
+        "id": "342f4246.9d954e",
         "type": "outcome",
         "name": "SdwanBandwidthChange",
         "xml": "<outcome value='SdwanBandwidthChange'>",
         "comments": "",
         "outputs": 1,
-        "x": 1275.8720092773438,
-        "y": 1815.315613746643,
-        "z": "efc57676.46ecd8",
+        "x": 1170.9999771118164,
+        "y": 1653.0001201629639,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "a17addc8.31a34"
+                "5223bfb2.d63e18"
             ]
         ]
     },
     {
-        "id": "a17addc8.31a34",
+        "id": "5223bfb2.d63e18",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1669.3958129882812,
-        "y": 1815.8363814353943,
-        "z": "efc57676.46ecd8",
+        "x": 1564.523780822754,
+        "y": 1653.520887851715,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "4da413d8.1ef91c",
+        "id": "8235fd9d.7ee738",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1201.5863647460938,
-        "y": 1888.759217262268,
-        "z": "efc57676.46ecd8",
+        "x": 1096.7143325805664,
+        "y": 1726.4437236785889,
+        "z": "493735c0.a952fc",
         "wires": [
             [
-                "b40cb9f3.46e0e8"
+                "668547c7.be02a"
             ]
         ]
     },
     {
-        "id": "b40cb9f3.46e0e8",
+        "id": "668547c7.be02a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1354.8720169067383,
-        "y": 1888.815613746643,
-        "z": "efc57676.46ecd8",
+        "x": 1249.999984741211,
+        "y": 1726.5001201629639,
+        "z": "493735c0.a952fc",
         "wires": [
             []
         ]
-    },
-    {
-        "id": "e9421b98.811ad8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 981.1580276489258,
-        "y": 386.01489448547363,
-        "z": "efc57676.46ecd8",
-        "wires": [
-            [
-                "8e441963.a45748",
-                "535b5f61.bae1"
-            ]
-        ]
-    },
-    {
-        "id": "8e441963.a45748",
-        "type": "set",
-        "name": "set skip-mdsal-update to Y",
-        "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
-        "comments": "",
-        "x": 1227.9435806274414,
-        "y": 362.3689384460449,
-        "z": "efc57676.46ecd8",
-        "wires": []
-    },
-    {
-        "id": "535b5f61.bae1",
-        "type": "set",
-        "name": "set ack-final to 'N' (default)",
-        "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
-        "comments": "",
-        "x": 1228.3721542358398,
-        "y": 402.36902236938477,
-        "z": "efc57676.46ecd8",
-        "wires": []
     }
 ]
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json
index cbe137c2..ff6eba98 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign.json
@@ -1,5798 +1 @@
-[
-    {
-        "id": "fa733965.8e1b48",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 116.66666412353516,
-        "y": 70.74699592590332,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "daf6d1e0.f0a85"
-            ]
-        ]
-    },
-    {
-        "id": "daf6d1e0.f0a85",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 231.9523696899414,
-        "y": 112.65177536010742,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "3a6f31b4.299cee"
-            ]
-        ]
-    },
-    {
-        "id": "3a6f31b4.299cee",
-        "type": "method",
-        "name": "method vnf-topology-operation-assign",
-        "xml": "<method rpc='vnf-topology-operation-assign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 204.76197052001953,
-        "y": 155.41365909576416,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9ab83872.914ab8"
-            ]
-        ]
-    },
-    {
-        "id": "21dff779.bf4cc8",
-        "type": "comment",
-        "name": "vnf-topology-operation-assign",
-        "info": "",
-        "comments": "",
-        "x": 492.6781921386719,
-        "y": 20,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "49a698b9.947698",
-        "type": "switchNode",
-        "name": "switch request-action",
-        "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 503.04761505126953,
-        "y": 303.8898277282715,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "725cf24d.8d4b4c",
-                "abc6c6e8.654018"
-            ]
-        ]
-    },
-    {
-        "id": "725cf24d.8d4b4c",
-        "type": "outcome",
-        "name": "CreateVnfInstance",
-        "xml": "<outcome value='CreateVnfInstance'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 756.7619094848633,
-        "y": 281.0327091217041,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b07fe8dd.932d38"
-            ]
-        ]
-    },
-    {
-        "id": "abc6c6e8.654018",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 718.7618751525879,
-        "y": 326.7470369338989,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "97a46274.9df5e"
-            ]
-        ]
-    },
-    {
-        "id": "b07fe8dd.932d38",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 941.6190376281738,
-        "y": 281.0327386856079,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c8588b9c.b0d898",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 174.4048080444336,
-        "y": 3352.7708625793457,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "50e14066.4a8fb",
-                "945671e8.3d2b7",
-                "7054feb2.2900b",
-                "25919575.6cb00a",
-                "10583438.2574cc",
-                "9cd27ab5.524f18",
-                "13077d8a.632752",
-                "8c40a330.8c84",
-                "996bdc9d.0d63b",
-                "2dd23fff.89a8d",
-                "f2f609da.bd9858",
-                "1b9bd518.29100b",
-                "4eb737ee.442a38",
-                "3530cc21.a0c0d4",
-                "2fcd14d0.0b537c",
-                "4796fba2.d51144",
-                "42f099e.9f61568",
-                "ab296e58.94c7",
-                "8dc1e7e0.9d5668",
-                "d03eeca7.23711",
-                "494fd3fe.881b4c",
-                "31dc7765.4b4208",
-                "ae22f7f9.632468",
-                "530dfe10.6f29",
-                "2f250d1f.126482",
-                "3c27d937.bf75c6",
-                "6ae8e0f.7c6952",
-                "dfdec27.324004",
-                "dc580d36.feec6",
-                "87cefff2.af896",
-                "9e4b2f5.d8554d",
-                "5563a4c5.a199ec",
-                "97421a9a.865f98",
-                "59c331da.0d09b",
-                "b01ba289.b4c4d",
-                "ebd11f4a.d9ea2"
-            ]
-        ]
-    },
-    {
-        "id": "ade9f393.c1d96",
-        "type": "get-resource",
-        "name": "get-resource VF_MODEL",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-model'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 515.3809204101562,
-        "y": 395.0326976776123,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1e3f6d8d.668b62",
-                "270acedb.4b2862"
-            ]
-        ]
-    },
-    {
-        "id": "1e3f6d8d.668b62",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 716.166618347168,
-        "y": 375.413535118103,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "df6715d9.ce37d8"
-            ]
-        ]
-    },
-    {
-        "id": "270acedb.4b2862",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 724.7380485534668,
-        "y": 419.6992483139038,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "e48fe633.d5a078"
-            ]
-        ]
-    },
-    {
-        "id": "50e14066.4a8fb",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 549.0475845336914,
-        "y": 1145.9851322174072,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a52ad9f3.5409f8",
-                "f1a27d38.307e4"
-            ]
-        ]
-    },
-    {
-        "id": "a52ad9f3.5409f8",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 774.7619132995605,
-        "y": 1113.1279201507568,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5a889bed.1fd0a4"
-            ]
-        ]
-    },
-    {
-        "id": "5a889bed.1fd0a4",
-        "type": "set",
-        "name": "set vnf-index=0",
-        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
-        "comments": "",
-        "x": 939.0476341247559,
-        "y": 1112.1279983520508,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "f1a27d38.307e4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 776.1904754638672,
-        "y": 1177.4137382507324,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ff49d41f.68ca58"
-            ]
-        ]
-    },
-    {
-        "id": "742d47cf.681298",
-        "type": "set",
-        "name": "set vnf-index = vnf_length",
-        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
-        "comments": "",
-        "x": 1194.0476303100586,
-        "y": 1155.699426651001,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "841debf7.ded508",
-        "type": "for",
-        "name": "for each existing VNF",
-        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1179.4761428833008,
-        "y": 1201.6993656158447,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7d0d1ffd.f9c63"
-            ]
-        ]
-    },
-    {
-        "id": "ff49d41f.68ca58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 949.9047355651855,
-        "y": 1177.413703918457,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "742d47cf.681298",
-                "841debf7.ded508"
-            ]
-        ]
-    },
-    {
-        "id": "7d0d1ffd.f9c63",
-        "type": "switchNode",
-        "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1533.7619094848633,
-        "y": 1201.270845413208,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8c6a6fdd.7581b"
-            ]
-        ]
-    },
-    {
-        "id": "8c6a6fdd.7581b",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1828.047664642334,
-        "y": 1200.8423299789429,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "67d1f32e.64262c"
-            ]
-        ]
-    },
-    {
-        "id": "7be2c7fd.7f9938",
-        "type": "comment",
-        "name": "make sure this VNF doesn't exist already",
-        "info": "",
-        "comments": "",
-        "x": 1520.904640197754,
-        "y": 1158.8422756195068,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "945671e8.3d2b7",
-        "type": "set",
-        "name": "set vnf-topology data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n",
-        "comments": "",
-        "x": 514.7618675231934,
-        "y": 1677.6518993377686,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "7054feb2.2900b",
-        "type": "switchNode",
-        "name": "switch input vnf-name",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 527.2618865966797,
-        "y": 2039.770956993103,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "794a160e.b68c48",
-                "109f5318.f22f2d"
-            ]
-        ]
-    },
-    {
-        "id": "25919575.6cb00a",
-        "type": "get-resource",
-        "name": "get-resource cloud region",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"cloud-region\" \n\t\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \n\t\t     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region AND\n\t\t     depth='all'\"\n        pfx='aai.cloud-region' local-only='false' >\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 559.4048309326172,
-        "y": 2935.7706928253174,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "da5da517.ae2e18",
-                "54304dd.70307b4"
-            ]
-        ]
-    },
-    {
-        "id": "54304dd.70307b4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 767.5081481933594,
-        "y": 2954.921399116516,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "cbecda63.60f978"
-            ]
-        ]
-    },
-    {
-        "id": "da5da517.ae2e18",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 776.4367446899414,
-        "y": 2912.2071323394775,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "55ab3764.a14138"
-            ]
-        ]
-    },
-    {
-        "id": "10583438.2574cc",
-        "type": "get-resource",
-        "name": "get-resource VF_TO_NETWORK_ROLE_MAPPING",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-network-role-mapping[]'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 624.6429138183594,
-        "y": 3246.8182125091553,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b9431e3d.b421d",
-                "395440a1.5e6de"
-            ]
-        ]
-    },
-    {
-        "id": "b9431e3d.b421d",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 920.4285850524902,
-        "y": 3225.532377243042,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5be8614b.d2283"
-            ]
-        ]
-    },
-    {
-        "id": "395440a1.5e6de",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 929.0000152587891,
-        "y": 3269.818090438843,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "4f0a7869.c1d018"
-            ]
-        ]
-    },
-    {
-        "id": "fde1d716.a4a0e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1025.5716133117676,
-        "y": 4363.460702896118,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "abcfb9a1.c41368",
-                "912ecbf0.ffa438",
-                "c223a2fd.f4871",
-                "7e1ee9f5.bc8198",
-                "c6001282.4b6e1",
-                "ea99e7e9.ed0b98",
-                "c41b6137.b6d4b",
-                "8dc14ff8.fbd57",
-                "4e569933.c14918"
-            ]
-        ]
-    },
-    {
-        "id": "c223a2fd.f4871",
-        "type": "get-resource",
-        "name": "get-resource l3-network",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-networks\" \n\t\tkey=\"l3-network.network-role = $db.vf-network-role-mapping[$role-index].network-role\"\n        pfx='aai.l3-network' local-only='false'\n>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1275.2858123779297,
-        "y": 3453.8417415618896,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ede95f4d.859fa",
-                "3e760d07.8da062"
-            ]
-        ]
-    },
-    {
-        "id": "3e760d07.8da062",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1480.7621269226074,
-        "y": 3483.1273441314697,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "4fcc2ec6.5268d"
-            ]
-        ]
-    },
-    {
-        "id": "ede95f4d.859fa",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1488.2621231079102,
-        "y": 3434.2703142166138,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1b9558ce.3c84a7"
-            ]
-        ]
-    },
-    {
-        "id": "abcfb9a1.c41368",
-        "type": "set",
-        "name": "set vnf-network data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'\n    value='`$db.vf-network-role-mapping[$role-index].network-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'\n    value='`$aai.l3-network.l3-network[$db-network-index].network-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'\n    value='`$aai.l3-network.l3-network[$db-network-index].neutron-network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'\n    value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'\n    value='`$aai.l3-network.l3-network[$db-network-index].contrail-network-fqdn`' />\n",
-        "comments": "",
-        "x": 1271.6192779541016,
-        "y": 4259.413550376892,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "996bdc9d.0d63b",
-        "type": "for",
-        "name": "for each cloud-region availability zone",
-        "xml": "<for index='idx' start='0' end='`$aai.cloud-region.availability-zones.availability-zone_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 492.00031661987305,
-        "y": 5506.532527923584,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b2e77d6f.5c88e"
-            ]
-        ]
-    },
-    {
-        "id": "cab1cdc0.80552",
-        "type": "set",
-        "name": "set availability-zone",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[$idx]'\n  value='`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`' />\n",
-        "comments": "",
-        "x": 953.6669998168945,
-        "y": 5475.865942001343,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "2dd23fff.89a8d",
-        "type": "set",
-        "name": "set vnf-parameters-data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n",
-        "comments": "",
-        "x": 451.6192436218262,
-        "y": 5356.484888076782,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "c622b6f5.5fb0e8",
-        "type": "save",
-        "name": "save generic-vnf l3-network relationships",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 918.1907768249512,
-        "y": 5650.29474067688,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "72e530eb.ef2a9",
-                "560ad615.6ebaf8"
-            ]
-        ]
-    },
-    {
-        "id": "4eb737ee.442a38",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 405.7145233154297,
-        "y": 6313.055904388428,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "1b9bd518.29100b",
-        "type": "set",
-        "name": "set vnf-level-oper-status to PendingCreate",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
-        "comments": "",
-        "x": 501.24223709106445,
-        "y": 6018.250611305237,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "13077d8a.632752",
-        "type": "for",
-        "name": "for each network-role",
-        "xml": "<for silentFailure='true' index='role-index' start='0' end='`$db.vf-network-role-mapping_length`'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 485.57154846191406,
-        "y": 4336.794371604919,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b7e5144f.5264b8"
-            ]
-        ]
-    },
-    {
-        "id": "9cd27ab5.524f18",
-        "type": "set",
-        "name": "set network-index = 0",
-        "xml": "<set>\n<parameter name='network-index' value='0' />\n",
-        "comments": "",
-        "x": 527.0714111328125,
-        "y": 3300.8660068511963,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "912ecbf0.ffa438",
-        "type": "set",
-        "name": "increment network-index",
-        "xml": "<set>\n<parameter name='network-index' value='`$network-index + 1`' />\n",
-        "comments": "",
-        "x": 1253.6192665100098,
-        "y": 5307.175491333008,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "8c40a330.8c84",
-        "type": "set",
-        "name": "set vnf-network_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length'\n  value='`$network-index`' />\n",
-        "comments": "",
-        "x": 450.4763298034668,
-        "y": 5306.484931945801,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "f2f609da.bd9858",
-        "type": "set",
-        "name": "copy input data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
-        "comments": "",
-        "x": 416.7620658874512,
-        "y": 5965.913442611694,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "3530cc21.a0c0d4",
-        "type": "for",
-        "name": "for each vnf-network",
-        "xml": "<for index='vnf-nw-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 441.1906852722168,
-        "y": 5649.29465675354,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b6d2730a.405db"
-            ]
-        ]
-    },
-    {
-        "id": "b6d2730a.405db",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 644.8573265075684,
-        "y": 5649.294617652893,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c622b6f5.5fb0e8"
-            ]
-        ]
-    },
-    {
-        "id": "2fcd14d0.0b537c",
-        "type": "set",
-        "name": "set new vnf_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
-        "comments": "",
-        "x": 497.6905059814453,
-        "y": 1198.0090227127075,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "4796fba2.d51144",
-        "type": "for",
-        "name": "for each cloud-region relationship",
-        "xml": "<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 572.2619552612305,
-        "y": 3023.008864402771,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "de35f354.4a026"
-            ]
-        ]
-    },
-    {
-        "id": "de35f354.4a026",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 819.9404983520508,
-        "y": 3022.7587938308716,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9753c9fc.ee6548"
-            ]
-        ]
-    },
-    {
-        "id": "9753c9fc.ee6548",
-        "type": "outcome",
-        "name": "complex",
-        "xml": "<outcome value='complex'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 989.4048194885254,
-        "y": 3022.1516160964966,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f1d0780c.c74608"
-            ]
-        ]
-    },
-    {
-        "id": "49d47361.e5235c",
-        "type": "set",
-        "name": "set aic-clli",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli'\n  value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\n",
-        "comments": "",
-        "x": 1366.976203918457,
-        "y": 3020.389811515808,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "42f099e.9f61568",
-        "type": "switchNode",
-        "name": "switch aic-clli",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 505.3095817565918,
-        "y": 3136.1039962768555,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "18989148.50f10f"
-            ]
-        ]
-    },
-    {
-        "id": "18989148.50f10f",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 653.4524154663086,
-        "y": 3136.103979110718,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9a466e25.4156f"
-            ]
-        ]
-    },
-    {
-        "id": "56b5f776.c4c628",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n",
-        "comments": "",
-        "x": 931.7621269226074,
-        "y": 2494.9612531661987,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "c7e1c13d.03db5",
-        "type": "for",
-        "name": "for each l3-network",
-        "xml": "<for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1391.8812561035156,
-        "y": 4083.984929084778,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c1ed15e6.f88648"
-            ]
-        ]
-    },
-    {
-        "id": "e75f10eb.ced4f",
-        "type": "switchNode",
-        "name": "switch orchestration-status",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1810.4524269104004,
-        "y": 4018.556393623352,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "acbbb297.0a07e",
-                "18131921.5c40e7",
-                "84ce6f22.6e9ac",
-                "a5969f85.edad",
-                "8306b63a.7a6a88"
-            ]
-        ]
-    },
-    {
-        "id": "acbbb297.0a07e",
-        "type": "outcome",
-        "name": "Pending Delete",
-        "xml": "<outcome value='Pending Delete'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2051.119297027588,
-        "y": 4060.222897529602,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "bcc48c45.57047"
-            ]
-        ]
-    },
-    {
-        "id": "18131921.5c40e7",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2023.9764366149902,
-        "y": 4111.222878456116,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f846017e.0f7b7"
-            ]
-        ]
-    },
-    {
-        "id": "d24ce0d7.c8619",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2559.6907386779785,
-        "y": 4056.460795402527,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c028438.b008bc",
-                "225c2fa8.b622f"
-            ]
-        ]
-    },
-    {
-        "id": "f846017e.0f7b7",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2193.976348876953,
-        "y": 4110.794255256653,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "3979a64c.84ab9a"
-            ]
-        ]
-    },
-    {
-        "id": "c028438.b008bc",
-        "type": "outcome",
-        "name": "cloud-region",
-        "xml": "<outcome value='cloud-region'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2733.9765243530273,
-        "y": 4079.365619659424,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "24abd19e.88186e"
-            ]
-        ]
-    },
-    {
-        "id": "24abd19e.88186e",
-        "type": "for",
-        "name": "for each relationship data",
-        "xml": "<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2931.11922454834,
-        "y": 4079.794087409973,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6e6e70c9.1f47f"
-            ]
-        ]
-    },
-    {
-        "id": "6e6e70c9.1f47f",
-        "type": "switchNode",
-        "name": "switch relationship-key",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3162.547824859619,
-        "y": 4079.3654623031616,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "41f73a04.000a34"
-            ]
-        ]
-    },
-    {
-        "id": "41f73a04.000a34",
-        "type": "outcome",
-        "name": "cloud-region.cloud-region-id",
-        "xml": "<outcome value='cloud-region.cloud-region-id'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3403.976390838623,
-        "y": 4079.3655586242676,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ec6b1424.dae298"
-            ]
-        ]
-    },
-    {
-        "id": "ec6b1424.dae298",
-        "type": "switchNode",
-        "name": "switch relationship-value == cloud-region-id",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3708.262310028076,
-        "y": 4079.22261428833,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "76d1c220.996b9c"
-            ]
-        ]
-    },
-    {
-        "id": "76d1c220.996b9c",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3413.2624473571777,
-        "y": 4196.865568161011,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1de3d6a.5295a29"
-            ]
-        ]
-    },
-    {
-        "id": "7e1ee9f5.bc8198",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1228.0954284667969,
-        "y": 4015.270573616028,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c7e1c13d.03db5",
-                "85730c77.85f6e"
-            ]
-        ]
-    },
-    {
-        "id": "c6001282.4b6e1",
-        "type": "set",
-        "name": "set l3-network-id = -1",
-        "xml": "<set>\n<parameter name='l3-network-id' value='-1' />\n",
-        "comments": "",
-        "x": 1272.4287872314453,
-        "y": 3887.175227165222,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "1de3d6a.5295a29",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3559.0954246520996,
-        "y": 4196.341676712036,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f676c278.1ddf2",
-                "6ee99534.f9db3c",
-                "133789d2.fbdb36"
-            ]
-        ]
-    },
-    {
-        "id": "f676c278.1ddf2",
-        "type": "set",
-        "name": "set l3-network-id = this l3-network",
-        "xml": "<set>\n<parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n",
-        "comments": "",
-        "x": 3794.333427429199,
-        "y": 4158.484645843506,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "ea99e7e9.ed0b98",
-        "type": "switchNode",
-        "name": "switch l3-network-id",
-        "xml": "<switch test='`$l3-network-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1269.4287109375,
-        "y": 4210.842268943787,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8b18bc8b.1ecc5"
-            ]
-        ]
-    },
-    {
-        "id": "8b18bc8b.1ecc5",
-        "type": "outcome",
-        "name": "-1",
-        "xml": "<outcome value='-1'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1439.4286613464355,
-        "y": 4210.842024803162,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d03cff5b.4eae8"
-            ]
-        ]
-    },
-    {
-        "id": "ab296e58.94c7",
-        "type": "switchNode",
-        "name": "switch input model-invariant-uuid",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 575.6192016601562,
-        "y": 2517.7856969833374,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a6d2444d.170f18",
-                "d0c4e96a.f0e598"
-            ]
-        ]
-    },
-    {
-        "id": "a6d2444d.170f18",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 781.2858734130859,
-        "y": 2494.9286603927612,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "56b5f776.c4c628"
-            ]
-        ]
-    },
-    {
-        "id": "d0c4e96a.f0e598",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 782.714469909668,
-        "y": 2539.2142515182495,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "53133cb6.18d844"
-            ]
-        ]
-    },
-    {
-        "id": "53133cb6.18d844",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n",
-        "comments": "",
-        "x": 937.0002059936523,
-        "y": 2538.6428236961365,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "6f1bca5a.057ce4",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n",
-        "comments": "",
-        "x": 932.7143974304199,
-        "y": 2583.4999294281006,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "8dc1e7e0.9d5668",
-        "type": "switchNode",
-        "name": "switch input model-uuid",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 548.2382202148438,
-        "y": 2606.3244342803955,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8002dd41.ae1f",
-                "896eccc9.b25eb"
-            ]
-        ]
-    },
-    {
-        "id": "8002dd41.ae1f",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 782.2381935119629,
-        "y": 2583.467366218567,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6f1bca5a.057ce4"
-            ]
-        ]
-    },
-    {
-        "id": "896eccc9.b25eb",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 783.6667900085449,
-        "y": 2627.752957344055,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "17701e26.510582"
-            ]
-        ]
-    },
-    {
-        "id": "17701e26.510582",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
-        "comments": "",
-        "x": 937.9525260925293,
-        "y": 2627.181529521942,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "b6fbf29a.0df09",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n",
-        "comments": "",
-        "x": 929.8573303222656,
-        "y": 2672.3571367263794,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "d03eeca7.23711",
-        "type": "switchNode",
-        "name": "switch input model-version",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 556.3810920715332,
-        "y": 2695.1815814971924,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6aa27ca4.a61d34",
-                "1ae6e106.ea9c7f"
-            ]
-        ]
-    },
-    {
-        "id": "6aa27ca4.a61d34",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 779.3810768127441,
-        "y": 2672.324543952942,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b6fbf29a.0df09"
-            ]
-        ]
-    },
-    {
-        "id": "1ae6e106.ea9c7f",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 780.8096733093262,
-        "y": 2716.61013507843,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "56c362db.13020c"
-            ]
-        ]
-    },
-    {
-        "id": "56c362db.13020c",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n",
-        "comments": "",
-        "x": 935.0954093933105,
-        "y": 2716.038707256317,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "9fcfee3c.f2226",
-        "type": "set",
-        "name": "set from DB",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n",
-        "comments": "",
-        "x": 929.8573303222656,
-        "y": 2759.4999589920044,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "494fd3fe.881b4c",
-        "type": "switchNode",
-        "name": "switch input model-name",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 551.3810920715332,
-        "y": 2782.3244037628174,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "3f7d112e.5f72ee",
-                "6e803b0d.a54dc4"
-            ]
-        ]
-    },
-    {
-        "id": "3f7d112e.5f72ee",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 779.3810768127441,
-        "y": 2759.467366218567,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9fcfee3c.f2226"
-            ]
-        ]
-    },
-    {
-        "id": "6e803b0d.a54dc4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 780.8096733093262,
-        "y": 2803.752957344055,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9d0420e8.1e34b"
-            ]
-        ]
-    },
-    {
-        "id": "9d0420e8.1e34b",
-        "type": "set",
-        "name": "set from input",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n",
-        "comments": "",
-        "x": 935.0954093933105,
-        "y": 2803.181529521942,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "bcc48c45.57047",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2204.3333892822266,
-        "y": 4060.9997749328613,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8306b63a.7a6a88",
-        "type": "outcome",
-        "name": "PendingDelete",
-        "xml": "<outcome value='PendingDelete'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2049.000030517578,
-        "y": 4015.999689102173,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ea893bb0.586278"
-            ]
-        ]
-    },
-    {
-        "id": "ea893bb0.586278",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2204.214122772217,
-        "y": 4016.776566505432,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a5969f85.edad",
-        "type": "outcome",
-        "name": "Pending Create",
-        "xml": "<outcome value='Pending Create'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2051.000030517578,
-        "y": 3972.666193008423,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "bab4140b.02b308"
-            ]
-        ]
-    },
-    {
-        "id": "bab4140b.02b308",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2204.214122772217,
-        "y": 3973.443070411682,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "84ce6f22.6e9ac",
-        "type": "outcome",
-        "name": "PendingCreate",
-        "xml": "<outcome value='PendingCreate'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2051.000030517578,
-        "y": 3929.332941055298,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "fc3367.845aac98"
-            ]
-        ]
-    },
-    {
-        "id": "fc3367.845aac98",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2204.214122772217,
-        "y": 3930.109818458557,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a129d9ae.667dd8",
-        "type": "for",
-        "name": "for each A&AI subnet",
-        "xml": "<for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1737.3810577392578,
-        "y": 4350.047110080719,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "26e050ad.0575e"
-            ]
-        ]
-    },
-    {
-        "id": "84d519bc.318478",
-        "type": "set",
-        "name": "set subnet_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' />\n",
-        "comments": "",
-        "x": 1726.047622680664,
-        "y": 4395.04719209671,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "31dc7765.4b4208",
-        "type": "set",
-        "name": "set availability-zones.max-count and length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.max-count'\n   value='`$db.vf-model.avail-zone-max-count`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone_length'\n   value='`$aai.cloud-region.availability-zones.availability-zone_length`' />\n",
-        "comments": "",
-        "x": 511.66682052612305,
-        "y": 5594.547995567322,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "ae22f7f9.632468",
-        "type": "set",
-        "name": "set vnf-name",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name'\n   value='`$tmp.vnf-name`' />\n",
-        "comments": "",
-        "x": 512.5000152587891,
-        "y": 2451.8334608078003,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "530dfe10.6f29",
-        "type": "save",
-        "name": "update generic-vnf",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"vnf-name\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name`\" />\n<parameter name=\"prov-status\" value=\"PREPROV\" />\n<!-- <parameter name=\"operational-status\" value=\"out-of-service-path\" /> -->\n<parameter name=\"equipment-role\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role`\" />\n<parameter name=\"model-invariant-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid`\" />\n<parameter name=\"model-version-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid`\" />\n<parameter name=\"model-customization-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid`\" />\n<parameter name=\"in-maint\" value=\"true\" />\n<parameter name=\"selflink\" value=\"`$vnf-object-path`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 432.0000877380371,
-        "y": 5804.213758468628,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8c964a5c.697478",
-                "9e7283af.92a1c"
-            ]
-        ]
-    },
-    {
-        "id": "2f250d1f.126482",
-        "type": "set",
-        "name": "set vnf-object-path",
-        "xml": "<set>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
-        "comments": "",
-        "x": 432.00012588500977,
-        "y": 5734.214241027832,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "3c27d937.bf75c6",
-        "type": "set",
-        "name": "set vnf-id",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",
-        "comments": "",
-        "x": 500.83335876464844,
-        "y": 2403.5000038146973,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "6ae8e0f.7c6952",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnf.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 397.76210021972656,
-        "y": 6178.976177215576,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "72e530eb.ef2a9",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1168.0241317749023,
-        "y": 5627.833315849304,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1d23943a.cc401c"
-            ]
-        ]
-    },
-    {
-        "id": "560ad615.6ebaf8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1176.5955619812012,
-        "y": 5672.119029045105,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "48b115c8.09c9bc"
-            ]
-        ]
-    },
-    {
-        "id": "8c964a5c.697478",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 606.3574180603027,
-        "y": 5782.833353996277,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b5f5454e.605518"
-            ]
-        ]
-    },
-    {
-        "id": "9e7283af.92a1c",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 614.9288482666016,
-        "y": 5827.119067192078,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "fb7909b7.07d3a8"
-            ]
-        ]
-    },
-    {
-        "id": "dfdec27.324004",
-        "type": "set",
-        "name": "set model-customization-uuid",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n",
-        "comments": "",
-        "x": 564.1666793823242,
-        "y": 2855.1666078567505,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "f7d7f0fa.89cd2",
-        "type": "execute",
-        "name": "split related-link",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='aai-uid-split' />\n   <parameter name='original_string' value='`$aai.cloud-region.relationship-list.relationship[$idx].related-link`' />\n   <parameter name='regex' value='/' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1386.357063293457,
-        "y": 2975.1517295837402,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f1d0780c.c74608",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1172.0237655639648,
-        "y": 3021.8185176849365,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f7d7f0fa.89cd2",
-                "49d47361.e5235c",
-                "68e794dc.43eb9c"
-            ]
-        ]
-    },
-    {
-        "id": "68e794dc.43eb9c",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 1356.0237274169922,
-        "y": 3065.1518144607544,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "b2e77d6f.5c88e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 743.6667594909668,
-        "y": 5505.628111839294,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "cab1cdc0.80552",
-                "2c7d624d.a1567e"
-            ]
-        ]
-    },
-    {
-        "id": "2c7d624d.a1567e",
-        "type": "save",
-        "name": "save generic-vnf availability-zone relationship",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"availability-zone\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.cloud-region.cloud-owner`\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"availability-zone.availability-zone-name\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1037.0001487731934,
-        "y": 5528.9615659713745,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7e45c7a1.1fc228",
-                "7cb74929.a6a798"
-            ]
-        ]
-    },
-    {
-        "id": "7e45c7a1.1fc228",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1301.8334007263184,
-        "y": 5509.833388328552,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ac3d2a38.193128"
-            ]
-        ]
-    },
-    {
-        "id": "7cb74929.a6a798",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1310.4048309326172,
-        "y": 5554.119101524353,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "edd6eeb3.58833"
-            ]
-        ]
-    },
-    {
-        "id": "4f0a7869.c1d018",
-        "type": "set",
-        "name": "set mapping rows to 0",
-        "xml": "<set>\n<parameter name='db.vf-network-role-mapping_length' value='0' />\n",
-        "comments": "",
-        "x": 1122.9761505126953,
-        "y": 3269.437578201294,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "dc580d36.feec6",
-        "type": "switchNode",
-        "name": "switch AAI availability-zone_length",
-        "xml": "<switch test='`$aai.cloud-region.availability-zones.availability-zone_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 484.381046295166,
-        "y": 5409.437698364258,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "65cd03d3.cd933c"
-            ]
-        ]
-    },
-    {
-        "id": "65cd03d3.cd933c",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 702.952465057373,
-        "y": 5409.009107589722,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5cdda0db.c6c79"
-            ]
-        ]
-    },
-    {
-        "id": "55344fcf.542e2",
-        "type": "set",
-        "name": "set availability-zone_length to 0",
-        "xml": "<set>\n<parameter name='aai.cloud-region.availability-zones.availability-zone_length' value='0' />\n",
-        "comments": "",
-        "x": 1304.3811073303223,
-        "y": 5427.580345153809,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "5cdda0db.c6c79",
-        "type": "switchNode",
-        "name": "switch AZ max count > 0",
-        "xml": "<switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 891.5239372253418,
-        "y": 5409.43741941452,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "689f8ebb.877dd",
-                "dd9a3b97.b39268"
-            ]
-        ]
-    },
-    {
-        "id": "689f8ebb.877dd",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1094.3810443878174,
-        "y": 5383.723169326782,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "63585eee.6f434"
-            ]
-        ]
-    },
-    {
-        "id": "dd9a3b97.b39268",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1095.8096656799316,
-        "y": 5428.008916854858,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "55344fcf.542e2"
-            ]
-        ]
-    },
-    {
-        "id": "2bc8145e.9e6d7c",
-        "type": "execute",
-        "name": "execute PropertiesNode",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 510.95240020751953,
-        "y": 177.1755828857422,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "794a160e.b68c48",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 729.2857055664062,
-        "y": 1853.2470073699951,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8d68e064.9148"
-            ]
-        ]
-    },
-    {
-        "id": "b4c0271b.8d9548",
-        "type": "switchNode",
-        "name": "switch ecomp-naming",
-        "xml": "<switch test='`$db.vf-model.ecomp-generated-naming`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1106.9050941467285,
-        "y": 1753.961443901062,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1882b0bf.c2311f",
-                "2eeee2ce.d551be",
-                "b8c05ccb.47683"
-            ]
-        ]
-    },
-    {
-        "id": "8d68e064.9148",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 875.0002059936523,
-        "y": 1853.247124671936,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b4c0271b.8d9548",
-                "2febaea8.95a862"
-            ]
-        ]
-    },
-    {
-        "id": "2eeee2ce.d551be",
-        "type": "outcome",
-        "name": "N",
-        "xml": "<outcome value='N'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1293.333480834961,
-        "y": 1754.4375705718994,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "da3712d9.f41f4"
-            ]
-        ]
-    },
-    {
-        "id": "1882b0bf.c2311f",
-        "type": "outcome",
-        "name": "Y",
-        "xml": "<outcome value='Y'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1293.3334732055664,
-        "y": 1713.0090246200562,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "18523eea.6d6ad1"
-            ]
-        ]
-    },
-    {
-        "id": "b8c05ccb.47683",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1293.3334197998047,
-        "y": 1797.2947025299072,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "da3712d9.f41f4"
-            ]
-        ]
-    },
-    {
-        "id": "18523eea.6d6ad1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1430.476390838623,
-        "y": 1713.151891708374,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "109f5318.f22f2d",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 714.476432800293,
-        "y": 2207.866183280945,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "fa97f7fa.540fd8"
-            ]
-        ]
-    },
-    {
-        "id": "fa97f7fa.540fd8",
-        "type": "set",
-        "name": "set tmp.vnf-name",
-        "xml": "<set>\n<parameter name='tmp.vnf-name' value=\"`$vnf-topology-operation-input.vnf-information.vnf-name`\" />\n",
-        "comments": "",
-        "x": 880.238395690918,
-        "y": 2206.7234535217285,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "8d7fa952.98d108",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:generate-unique-name",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1765.3096733093262,
-        "y": 1903.0089440345764,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "681ac6a0.a11838",
-                "f4abec22.90002"
-            ]
-        ]
-    },
-    {
-        "id": "681ac6a0.a11838",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2042.4524765014648,
-        "y": 1876.5804772377014,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6d7f13cc.8d975c"
-            ]
-        ]
-    },
-    {
-        "id": "f4abec22.90002",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2047.2142219543457,
-        "y": 1921.9613881111145,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f9e4fa65.eb0968"
-            ]
-        ]
-    },
-    {
-        "id": "b5dba753.21ae88",
-        "type": "set",
-        "name": "set variables for generating unique name",
-        "xml": "<set>\n<parameter name='generate-unique-name-input.action' value='ASSIGN' />\n<parameter name='generate-unique-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='generate-unique-name-input.index-table-name' value='VNF_NAME_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vnf_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNF_INSTANCE' />\n<parameter name='generate-unique-name-input.prefix' value=\"`'z' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + $db.vf-model.nf-code`\" />\n",
-        "comments": "",
-        "x": 1720.3099250793457,
-        "y": 1854.1042637825012,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "f9e4fa65.eb0968",
-        "type": "set",
-        "name": "set tmp.vnf-name to generated name",
-        "xml": "<set>\n<parameter name='tmp.vnf-name' value='`$generate-unique-name-output.generated-name`' />\n",
-        "comments": "",
-        "x": 2270.1186180114746,
-        "y": 1921.4374632835388,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "2febaea8.95a862",
-        "type": "switchNode",
-        "name": "switch naming-policy",
-        "xml": "<switch test='`$db.vf-model.naming-policy`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1104.6906776428223,
-        "y": 1962.2470607757568,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8f7b27bf.e7e3a8",
-                "b931038a.dea97"
-            ]
-        ]
-    },
-    {
-        "id": "8f7b27bf.e7e3a8",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1294.6906089782715,
-        "y": 1883.675615310669,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1ce185e2.fb229a"
-            ]
-        ]
-    },
-    {
-        "id": "b931038a.dea97",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1294.9288482666016,
-        "y": 2011.056559562683,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "42c58d7a.bc5884"
-            ]
-        ]
-    },
-    {
-        "id": "1ce185e2.fb229a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1447.5478782653809,
-        "y": 1882.2470817565918,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b5dba753.21ae88",
-                "8d7fa952.98d108"
-            ]
-        ]
-    },
-    {
-        "id": "17d076a4.213ab9",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1786.595802307129,
-        "y": 2026.7709412574768,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7ca77e3f.200f2",
-                "edded880.2d4e08"
-            ]
-        ]
-    },
-    {
-        "id": "42c58d7a.bc5884",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1449.4526977539062,
-        "y": 2011.056559562683,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9ce0b71c.18bda8",
-                "17d076a4.213ab9"
-            ]
-        ]
-    },
-    {
-        "id": "9ce0b71c.18bda8",
-        "type": "set",
-        "name": "set variables for generating name",
-        "xml": "<set>\n<parameter name='naming-policy-generate-name-input.policy-instance-name' value='`$db.vf-model.naming-policy`' />\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='ASSIGN' />\n<parameter name='naming-policy-generate-name-input.query-parameter' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />",
-        "comments": "",
-        "x": 1696.595718383789,
-        "y": 1981.05659532547,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "efe8f3b.6be4a1",
-        "type": "set",
-        "name": "set tmp.vnf-name to generated name",
-        "xml": "<set>\n<parameter name='tmp.vnf-name' value='`$naming-policy-generate-name-output.vnf-name`' />\n",
-        "comments": "",
-        "x": 2346.4527740478516,
-        "y": 2046.770751953125,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "f54d4b54.f29d58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1585.7142028808594,
-        "y": 6319.317764282227,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "48898d5.e385374",
-                "748556dc.ead268",
-                "87f91dc6.de07b",
-                "b319ef18.b3bad"
-            ]
-        ]
-    },
-    {
-        "id": "748556dc.ead268",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1964.285629272461,
-        "y": 6294.460662126541,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "48898d5.e385374",
-        "type": "set",
-        "name": "set variables for deleting name",
-        "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
-        "comments": "",
-        "x": 1865.7142486572266,
-        "y": 6247.317733049393,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "b779e958.044168",
-        "type": "comment",
-        "name": "Unassign the VNF name",
-        "info": "",
-        "comments": "",
-        "x": 1731.6665725708008,
-        "y": 6187.889232873917,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "7ca77e3f.200f2",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2084.761848449707,
-        "y": 2001.6994485855103,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "702e58b3.200b38"
-            ]
-        ]
-    },
-    {
-        "id": "edded880.2d4e08",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2089.523593902588,
-        "y": 2047.0803594589233,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "efe8f3b.6be4a1"
-            ]
-        ]
-    },
-    {
-        "id": "8e72cfc8.575e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 739.9999465942383,
-        "y": 1356.666666984558,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "46dd139e.86081c",
-                "761b2c43.67ef34"
-            ]
-        ]
-    },
-    {
-        "id": "87cefff2.af896",
-        "type": "for",
-        "name": "for each instance group id",
-        "xml": "<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 523.3332939147949,
-        "y": 1357.333312034607,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8e72cfc8.575e"
-            ]
-        ]
-    },
-    {
-        "id": "46dd139e.86081c",
-        "type": "get-resource",
-        "name": "get-resource instance-group",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"instance-group\" \n\t\tkey=\"instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\"\n        pfx='aai.instance-group' local-only='false' >\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 967.9999847412109,
-        "y": 1288.3334255218506,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "113b83c3.c5f2cc",
-                "1095d6a8.eb1ea9"
-            ]
-        ]
-    },
-    {
-        "id": "1095d6a8.eb1ea9",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1185.5792770385742,
-        "y": 1319.8174781799316,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6b5b96d7.f11058"
-            ]
-        ]
-    },
-    {
-        "id": "113b83c3.c5f2cc",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1194.5081100463867,
-        "y": 1256.4366302490234,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "3d4ce14c.b56fbe"
-            ]
-        ]
-    },
-    {
-        "id": "761b2c43.67ef34",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 944.9999618530273,
-        "y": 1428.3333644866943,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ef07f13d.87a9"
-            ]
-        ]
-    },
-    {
-        "id": "ef07f13d.87a9",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$aai.instance-group.relationship-list.relationship[$rel-index].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1158.3334045410156,
-        "y": 1428.333303451538,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "df5b0cc3.ccd9a"
-            ]
-        ]
-    },
-    {
-        "id": "df5b0cc3.ccd9a",
-        "type": "outcome",
-        "name": "collection",
-        "xml": "<outcome value='collection'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1330.00004196167,
-        "y": 1428.3333854675293,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "98da2133.07fbe"
-            ]
-        ]
-    },
-    {
-        "id": "98da2133.07fbe",
-        "type": "get-resource",
-        "name": "get-resource collection",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"collection\" \n\t\tkey=\"collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n        pfx='aai.collection' local-only='false' >\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1549.9999465942383,
-        "y": 1426.6666469573975,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c6ab56ad.e1e918",
-                "c4f813df.f6eb3",
-                "fa511cd0.4acf7"
-            ]
-        ]
-    },
-    {
-        "id": "c4f813df.f6eb3",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1764.2461395263672,
-        "y": 1378.1508359909058,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1cfc4c24.ab0124"
-            ]
-        ]
-    },
-    {
-        "id": "c6ab56ad.e1e918",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1773.1747360229492,
-        "y": 1336.4365692138672,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "75f0b66c.711368"
-            ]
-        ]
-    },
-    {
-        "id": "fa511cd0.4acf7",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1783.33345413208,
-        "y": 1539.9999542236328,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "2caf3e47.5abe82"
-            ]
-        ]
-    },
-    {
-        "id": "2caf3e47.5abe82",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1936.6665954589844,
-        "y": 1539.3332500457764,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "889214a0.071c58",
-                "61c009cd.371838",
-                "1b8b156c.6c083b",
-                "79b15187.90b49",
-                "67373c69.98b004"
-            ]
-        ]
-    },
-    {
-        "id": "889214a0.071c58",
-        "type": "for",
-        "name": "for each network-instance-group",
-        "xml": "<for silentFailure='true' index='nig-index' start='0' end='`$service-data.network-instance-groups.network-instance-group_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2249.2857360839844,
-        "y": 1488.5715045928955,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "64d1075e.ee3f48"
-            ]
-        ]
-    },
-    {
-        "id": "61c009cd.371838",
-        "type": "set",
-        "name": "set found-network-instance-group to false",
-        "xml": "<set>\n<parameter name='found-network-instance-group' value='false' />\n",
-        "comments": "",
-        "x": 2279.2856979370117,
-        "y": 1441.9048767089844,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "64d1075e.ee3f48",
-        "type": "switchNode",
-        "name": "network-instance-group-id matches?",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n  == $service-data.network-instance-groups.network-instance-group[$nig-index].network-instance-group-id`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2565.952247619629,
-        "y": 1488.5715036392212,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "e14a30ad.b266"
-            ]
-        ]
-    },
-    {
-        "id": "e14a30ad.b266",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2787.619026184082,
-        "y": 1488.5714683532715,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "338a6e83.74e682"
-            ]
-        ]
-    },
-    {
-        "id": "338a6e83.74e682",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2917.61905670166,
-        "y": 1488.5715446472168,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b65b391.a6cd9c8",
-                "5a856f0a.aefef"
-            ]
-        ]
-    },
-    {
-        "id": "b65b391.a6cd9c8",
-        "type": "set",
-        "name": "set found-network-instance-group to true",
-        "xml": "<set>\n<parameter name='found-network-instance-group' value='true' />\n",
-        "comments": "",
-        "x": 3190.952423095703,
-        "y": 1463.5715236663818,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "5a856f0a.aefef",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 3084.2860374450684,
-        "y": 1511.904893875122,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "1b8b156c.6c083b",
-        "type": "switchNode",
-        "name": "switch found-network-instance-group",
-        "xml": "<switch test='`$found-network-instance-group`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2260.9523544311523,
-        "y": 1538.5714855194092,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "49805ef2.194a"
-            ]
-        ]
-    },
-    {
-        "id": "49805ef2.194a",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2482.6192016601562,
-        "y": 1538.5715079307556,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a3ec7ac.ac12b88"
-            ]
-        ]
-    },
-    {
-        "id": "9e4b2f5.d8554d",
-        "type": "set",
-        "name": "set tmp.vnf-network-collection_length to 0",
-        "xml": "<set>\n<parameter name='tmp.vnf-network-collection_length' value='0' />\n",
-        "comments": "",
-        "x": 571.666633605957,
-        "y": 1308.3334436416626,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "79b15187.90b49",
-        "type": "set",
-        "name": "set vnf-network-collection data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-instance-group-function'\n  value='`$aai.instance-group.instance-group-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-instance-group-id'\n  value='`$aai.instance-group.id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-collection-service-instance-id'\n  value='`$service-data.network-instance-groups.network-instance-group[$nig-index].service-instance-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-collection-customization-uuid'\n  value='`$aai.collection.collection-customization-id`' />\n",
-        "comments": "",
-        "x": 2240.95267868042,
-        "y": 1586.904821395874,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "67373c69.98b004",
-        "type": "set",
-        "name": "increment tmp.vnf-network-collection_length",
-        "xml": "<set>\n<parameter name='tmp.vnf-network-collection_length' value='`$tmp.vnf-network-collection_length + 1`' />\n",
-        "comments": "",
-        "x": 2282.619384765625,
-        "y": 1633.5714893341064,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "5563a4c5.a199ec",
-        "type": "set",
-        "name": "set vnf-network-collection_length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection_length'\n  value='`$tmp.vnf-network-collection_length`' />\n",
-        "comments": "",
-        "x": 550.8333282470703,
-        "y": 1565.8333930969238,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "a9b7ab72.63a7e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 668.6667098999023,
-        "y": 5898.80961894989,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f0f08819.d9d3b8"
-            ]
-        ]
-    },
-    {
-        "id": "97421a9a.865f98",
-        "type": "for",
-        "name": "for each instance group id",
-        "xml": "<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 452.000057220459,
-        "y": 5899.476263999939,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a9b7ab72.63a7e8"
-            ]
-        ]
-    },
-    {
-        "id": "f0f08819.d9d3b8",
-        "type": "save",
-        "name": "save generic-vnf relationship to instance-group",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-information.vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"instance-group\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/instance-groups/instance-group/'\n        + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 952.0000381469727,
-        "y": 5898.333299636841,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7a8ee12f.371a6",
-                "1be782fa.92bfcd"
-            ]
-        ]
-    },
-    {
-        "id": "7a8ee12f.371a6",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1211.3572616577148,
-        "y": 5875.285715103149,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b5b87fb0.590f"
-            ]
-        ]
-    },
-    {
-        "id": "1be782fa.92bfcd",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1219.9286918640137,
-        "y": 5919.57142829895,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "610d2304.a3d70c"
-            ]
-        ]
-    },
-    {
-        "id": "c41b6137.b6d4b",
-        "type": "switchNode",
-        "name": "switch subnet_length",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1273.5714569091797,
-        "y": 4331.428667068481,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f2057e5e.eaee4",
-                "f813a06e.cb2a1",
-                "ce347497.746558"
-            ]
-        ]
-    },
-    {
-        "id": "f2057e5e.eaee4",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1446.4286193847656,
-        "y": 4294.285726547241,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "82fb5a4d.e1f5b8"
-            ]
-        ]
-    },
-    {
-        "id": "f813a06e.cb2a1",
-        "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1447.8571891784668,
-        "y": 4332.856889724731,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "82fb5a4d.e1f5b8"
-            ]
-        ]
-    },
-    {
-        "id": "ce347497.746558",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1446.428653717041,
-        "y": 4371.428281784058,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7cc4f5b7.8976ac"
-            ]
-        ]
-    },
-    {
-        "id": "7cc4f5b7.8976ac",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1567.8572082519531,
-        "y": 4371.428548812866,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a129d9ae.667dd8",
-                "84d519bc.318478"
-            ]
-        ]
-    },
-    {
-        "id": "82fb5a4d.e1f5b8",
-        "type": "set",
-        "name": "set subnet_length to 0",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\n   value='0' />\n",
-        "comments": "",
-        "x": 1639.2858123779297,
-        "y": 4302.856889724731,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "9ab83872.914ab8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 256.74603271484375,
-        "y": 395.61908054351807,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "2bc8145e.9e6d7c",
-                "49a698b9.947698",
-                "ade9f393.c1d96",
-                "36f653c4.5383bc",
-                "16470885.0e3b37",
-                "1caeb411.8cfeac"
-            ]
-        ]
-    },
-    {
-        "id": "26e050ad.0575e",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1909.047664642334,
-        "y": 4350.032744407654,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6613870.b132378",
-                "722310bb.9f769",
-                "9fd39f7.3cbf46",
-                "d3095f31.7d4de"
-            ]
-        ]
-    },
-    {
-        "id": "8dc14ff8.fbd57",
-        "type": "set",
-        "name": "clear aai.l3-network",
-        "xml": "<set>\n<parameter name='aai.l3-network.' value='' />\n",
-        "comments": "",
-        "x": 1260.4762344360352,
-        "y": 3404.3182973861694,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "6ee99534.f9db3c",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 3709.3330459594727,
-        "y": 4250.032426834106,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "85730c77.85f6e",
-        "type": "set",
-        "name": "set found-network to false",
-        "xml": "<set>\n<parameter name='found-network' value='false' />\n",
-        "comments": "",
-        "x": 1409.0476379394531,
-        "y": 3955.7468309402466,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "3979a64c.84ab9a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2380.7619438171387,
-        "y": 4110.032627105713,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d24ce0d7.c8619",
-                "c4e4f6d8.6939d8"
-            ]
-        ]
-    },
-    {
-        "id": "c4e4f6d8.6939d8",
-        "type": "switchNode",
-        "name": "switch found-network",
-        "xml": "<switch test='`$found-network`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2572.1904907226562,
-        "y": 4140.032681465149,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8700444f.d17ae8"
-            ]
-        ]
-    },
-    {
-        "id": "133789d2.fbdb36",
-        "type": "set",
-        "name": "set found-network to true",
-        "xml": "<set>\n<parameter name='found-network' value='true' />\n",
-        "comments": "",
-        "x": 3765.047924041748,
-        "y": 4204.3181076049805,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "8700444f.d17ae8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2740.7619819641113,
-        "y": 4140.0326108932495,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "4c345848.e3a208"
-            ]
-        ]
-    },
-    {
-        "id": "4c345848.e3a208",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 2870.762050628662,
-        "y": 4138.604004859924,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "c1ed15e6.f88648",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1581.0476608276367,
-        "y": 4083.7469053268433,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "e75f10eb.ced4f",
-                "be46946a.165bb8"
-            ]
-        ]
-    },
-    {
-        "id": "be46946a.165bb8",
-        "type": "switchNode",
-        "name": "switch found-network",
-        "xml": "<switch test='`$found-network`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1791.0476150512695,
-        "y": 4155.746788978577,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "2f6a30a5.92d22"
-            ]
-        ]
-    },
-    {
-        "id": "2f6a30a5.92d22",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1959.6191062927246,
-        "y": 4155.746718406677,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "587b7976.a36108"
-            ]
-        ]
-    },
-    {
-        "id": "587b7976.a36108",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 2089.6191749572754,
-        "y": 4154.318112373352,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "9fd39f7.3cbf46",
-        "type": "set",
-        "name": "set subnet data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].ip-version'\n   value='`$tmp.ip-version`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-id'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].neutron-subnet-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].sdnc-subnet-id'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-role'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-name'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].network-start-address'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].network-start-address`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].gateway-address'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].gateway-address`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].cidr-mask'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].cidr-mask`' />\n",
-        "comments": "",
-        "x": 2063.3334312438965,
-        "y": 4380.714490890503,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "d3095f31.7d4de",
-        "type": "switchNode",
-        "name": "switch dhcp-enabled",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2077.8572120666504,
-        "y": 4433.557444572449,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a8c627c.ce253d8",
-                "39879203.ca3c2e"
-            ]
-        ]
-    },
-    {
-        "id": "a8c627c.ce253d8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2240.714376722063,
-        "y": 4412.1288022994995,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "85e1593a.3a1828"
-            ]
-        ]
-    },
-    {
-        "id": "39879203.ca3c2e",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2239.2857093811035,
-        "y": 4457.843228340149,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d7a92919.2d05e8"
-            ]
-        ]
-    },
-    {
-        "id": "85e1593a.3a1828",
-        "type": "set",
-        "name": "set dhcp-enabled to Y",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\n   value='Y' />\n",
-        "comments": "",
-        "x": 2413.571575164795,
-        "y": 4410.700198173523,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "d7a92919.2d05e8",
-        "type": "set",
-        "name": "set dhcp-enabled to N",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\n   value='N' />\n",
-        "comments": "",
-        "x": 2410.714344024658,
-        "y": 4457.843228340149,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "6613870.b132378",
-        "type": "switchNode",
-        "name": "switch subnet-role",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2078.333381652832,
-        "y": 4262.605116844177,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "75942d08.2adc24"
-            ]
-        ]
-    },
-    {
-        "id": "75942d08.2adc24",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2244.999984741211,
-        "y": 4262.604768753052,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "4010a065.68c26"
-            ]
-        ]
-    },
-    {
-        "id": "4010a065.68c26",
-        "type": "set",
-        "name": "set subnet-role to NONE",
-        "xml": "<set>\n<parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />\n",
-        "comments": "",
-        "x": 2426.6667709350586,
-        "y": 4261.93842124939,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "722310bb.9f769",
-        "type": "switchNode",
-        "name": "switch ip-version",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2073.5717163085938,
-        "y": 4327.096222877502,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5fa58662.2f38f8",
-                "df8a7995.4fde48"
-            ]
-        ]
-    },
-    {
-        "id": "5fa58662.2f38f8",
-        "type": "outcome",
-        "name": "4",
-        "xml": "<outcome value='4'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2239.285858154297,
-        "y": 4308.524620056152,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5516675c.dd67e8"
-            ]
-        ]
-    },
-    {
-        "id": "df8a7995.4fde48",
-        "type": "outcome",
-        "name": "6",
-        "xml": "<outcome value='6'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2239.285820007324,
-        "y": 4349.953363418579,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f2e70afd.b8c238"
-            ]
-        ]
-    },
-    {
-        "id": "5516675c.dd67e8",
-        "type": "set",
-        "name": "set tmp.ip-version to ipv4",
-        "xml": "<set>\n<parameter name='tmp.ip-version' value='ipv4' />\n",
-        "comments": "",
-        "x": 2426.428623199463,
-        "y": 4307.667547225952,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "f2e70afd.b8c238",
-        "type": "set",
-        "name": "set tmp.ip-version to ipv6",
-        "xml": "<set>\n<parameter name='tmp.ip-version' value='ipv6' />\n",
-        "comments": "",
-        "x": 2425.000175476074,
-        "y": 4349.953365325928,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "b7e5144f.5264b8",
-        "type": "switchNode",
-        "name": "switch network-role",
-        "xml": "<switch test='`$db.vf-network-role-mapping[$role-index].network-role`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 705.9999084472656,
-        "y": 4335.333273887634,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b3ca721f.fe335",
-                "272dba83.a8aed6",
-                "83078563.934988",
-                "5dd2d1e7.b5782"
-            ]
-        ]
-    },
-    {
-        "id": "b3ca721f.fe335",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 874.0951728820801,
-        "y": 4233.66668510437,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "15298732.e21cb9"
-            ]
-        ]
-    },
-    {
-        "id": "272dba83.a8aed6",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 872.6665496826172,
-        "y": 4361.999873161316,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "fde1d716.a4a0e8"
-            ]
-        ]
-    },
-    {
-        "id": "15298732.e21cb9",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1011.4761810302734,
-        "y": 4273.42826461792,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4e569933.c14918",
-        "type": "get-resource",
-        "name": "get-resource VNF_RELATED_NETWORK_ROLE",
-        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VNF_RELATED_NETWORK_ROLE where vnf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid\n    and network_role = $db.vf-network-role-mapping[$role-index].network-role'\n  pfx='db.vnf-related-network-role[]'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1368.0000038146973,
-        "y": 4665.079788208008,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "231fd20b.4ba7ee",
-                "7d447ac2.636e24"
-            ]
-        ]
-    },
-    {
-        "id": "231fd20b.4ba7ee",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1636.6666679382324,
-        "y": 4495.746629714966,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c3080a54.9b9f68"
-            ]
-        ]
-    },
-    {
-        "id": "7d447ac2.636e24",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1639.6666984558105,
-        "y": 4858.41314125061,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "75a86f84.f58c6"
-            ]
-        ]
-    },
-    {
-        "id": "75a86f84.f58c6",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1806.0000038146973,
-        "y": 4856.412796020508,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ec2c65f9.047778",
-                "ef924ba7.f37c58",
-                "13bb35f5.a0401a",
-                "e36fed30.43efa",
-                "13a6411b.4f65df",
-                "e8de30ac.6f904",
-                "dc960591.08f438",
-                "e90b4b31.6e7908",
-                "56b41d87.a09d94"
-            ]
-        ]
-    },
-    {
-        "id": "225c2fa8.b622f",
-        "type": "outcome",
-        "name": "service-instance",
-        "xml": "<outcome value='service-instance'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2744.285472869873,
-        "y": 4028.651467323303,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "99500da8.54e39"
-            ]
-        ]
-    },
-    {
-        "id": "99500da8.54e39",
-        "type": "for",
-        "name": "for each relationship data",
-        "xml": "<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2969.7613105773926,
-        "y": 4029.0800971984863,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ee0dc0db.eb114"
-            ]
-        ]
-    },
-    {
-        "id": "ee0dc0db.eb114",
-        "type": "switchNode",
-        "name": "switch relationship-key",
-        "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3204.9998817443848,
-        "y": 4027.413528442383,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d270b105.8ac1a"
-            ]
-        ]
-    },
-    {
-        "id": "d270b105.8ac1a",
-        "type": "outcome",
-        "name": "service-instance.service-instance-id",
-        "xml": "<outcome value='service-instance.service-instance-id'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3471.4282417297363,
-        "y": 4027.413592338562,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "bda20892.371be8"
-            ]
-        ]
-    },
-    {
-        "id": "bda20892.371be8",
-        "type": "set",
-        "name": "set network-service-instance-id",
-        "xml": "<set>\n<parameter name='network-service-instance-id'\n  value='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value`' />\n",
-        "comments": "",
-        "x": 3765.000026702881,
-        "y": 4025.747007369995,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "ec2c65f9.047778",
-        "type": "execute",
-        "name": "generate network-topology-identifier-structure url",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.network-topology-identifier-structure`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.part\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$network-service-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2125.3331718444824,
-        "y": 4552.080429077148,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "13bb35f5.a0401a",
-        "type": "execute",
-        "name": "execute RestApiCallNode - get network-topology-identifier-structure",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ntis-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ntis\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2182.33296585083,
-        "y": 4655.509169578552,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "3038b18e.e97b7e"
-            ]
-        ]
-    },
-    {
-        "id": "ef924ba7.f37c58",
-        "type": "execute",
-        "name": "generate network-topology-identifier-structure url (part 2)",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.part`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ntis-url\"/>\n    <parameter name=\"target\" value=\"{network-id}\"/>\n    <parameter name=\"replacement\" value=\"`$l3-network-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2146.9997596740723,
-        "y": 4595.413772583008,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "59c331da.0d09b",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnfa.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 452.33337783813477,
-        "y": 4502.079788208008,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3038b18e.e97b7e",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2511.442153930664,
-        "y": 4655.259647369385,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f361b5ff.f38548"
-            ]
-        ]
-    },
-    {
-        "id": "e36fed30.43efa",
-        "type": "set",
-        "name": "set is-trunked and segmentation-id in vnf-network",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].is-trunked'\n    value='`$mdsal-ntis.network-topology-identifier-structure.is-trunked`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].segmentation-id'\n    value='`$mdsal-ntis.network-topology-identifier-structure.segmentation-id`' />\n    ",
-        "comments": "",
-        "x": 2124.999988555908,
-        "y": 4715.746793746948,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "e8de30ac.6f904",
-        "type": "save",
-        "name": "custom query: get owning entity",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n      resource=\"custom-query\"\n      key=\"format = 'resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"tmp.AnAI-data.oe\">\n<parameter name=\"start[0]\" value=\"`'nodes/service-instances/service-instance?service-instance-id=' + $network-service-instance-id `\" />\n<parameter name=\"start_length\" value=\"1\" />\n<parameter name=\"query\" value=\"/query/owning-entity-fromService-instance\" /> \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2065.9998817443848,
-        "y": 4791.080276489258,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "bb11fe98.9b1b9",
-                "12e91c7e.074344"
-            ]
-        ]
-    },
-    {
-        "id": "bb11fe98.9b1b9",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2276.2379302978516,
-        "y": 4769.74663066864,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b897f854.8a4f58"
-            ]
-        ]
-    },
-    {
-        "id": "12e91c7e.074344",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2283.3808250427246,
-        "y": 4815.460855484009,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a1cce433.a5c9a8"
-            ]
-        ]
-    },
-    {
-        "id": "eb288d10.2446b",
-        "type": "save",
-        "name": "custom query: get tenant network",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n      resource=\"custom-query\"\n      key=\"format = 'resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"tmp.AnAI-data.get-networks\">\n<parameter name=\"start[0]\" value=\"`'/business/owning-entities/owning-entity/' + $tmp.AnAI-data.oe.results[0].owning-entity.owning-entity-id `\" />\n<parameter name=\"start_length\" value=\"1\" />\n<parameter name=\"query\" value=\"`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role\n  + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" /> \n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2515.6666984558105,
-        "y": 4964.080413818359,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "23ed24a4.2c91dc",
-                "b4f16506.66bd08"
-            ]
-        ]
-    },
-    {
-        "id": "23ed24a4.2c91dc",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2728.9047470092773,
-        "y": 4942.746912956238,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "3e5e2886.704ec8"
-            ]
-        ]
-    },
-    {
-        "id": "b4f16506.66bd08",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2736.0476417541504,
-        "y": 4988.461137771606,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "fb3762dd.d74d3"
-            ]
-        ]
-    },
-    {
-        "id": "e2f76977.fea098",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2482.6666984558105,
-        "y": 5090.0805587768555,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "586febb.af11914"
-            ]
-        ]
-    },
-    {
-        "id": "586febb.af11914",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2680.6666984558105,
-        "y": 5090.0805587768555,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1b7b682d.5dd008"
-            ]
-        ]
-    },
-    {
-        "id": "1b7b682d.5dd008",
-        "type": "outcome",
-        "name": "vlan-tag",
-        "xml": "<outcome value='vlan-tag'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2850.6666984558105,
-        "y": 5090.0805587768555,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9b43a30b.ab1c1"
-            ]
-        ]
-    },
-    {
-        "id": "9b43a30b.ab1c1",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3018.6666984558105,
-        "y": 5088.0805587768555,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "97d76a2c.076008",
-                "47618d94.b0d374",
-                "1bf4c98d.f9c076"
-            ]
-        ]
-    },
-    {
-        "id": "97d76a2c.076008",
-        "type": "set",
-        "name": "set vlan-tag-id",
-        "xml": "<set>\n<parameter name='vlan-tag-id' value='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value`' />\n",
-        "comments": "",
-        "x": 3194.6666984558105,
-        "y": 5048.0805587768555,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "47618d94.b0d374",
-        "type": "get-resource",
-        "name": "get-resource vlan-tag",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"vlan-tag\" \n\t\tkey=\"vlan-tag.vlan-tag-id = $vlan-tag-id\"\n        pfx='aai.vlan-tag' local-only='false'\n>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3216.6666984558105,
-        "y": 5106.0805587768555,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1f2ba326.d9772d",
-                "fbf7fa7c.23d608"
-            ]
-        ]
-    },
-    {
-        "id": "1f2ba326.d9772d",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3396.7143058776855,
-        "y": 5088.2236251831055,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "cf0cc9f2.e1c008"
-            ]
-        ]
-    },
-    {
-        "id": "13a6411b.4f65df",
-        "type": "for",
-        "name": "for each related network role",
-        "xml": "<for index='rel-network-role-index' start='0' end='`$db.vnf-related-network-role_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2053.6666297912598,
-        "y": 5020.414123535156,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "668947e0.2f65c8"
-            ]
-        ]
-    },
-    {
-        "id": "668947e0.2f65c8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2258.6666297912598,
-        "y": 5021.747268676758,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "eb288d10.2446b",
-                "e2f76977.fea098",
-                "986e7ac7.81d148"
-            ]
-        ]
-    },
-    {
-        "id": "e90b4b31.6e7908",
-        "type": "switchNode",
-        "name": "switch rn-index",
-        "xml": "<switch test='`$rn-index`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2014.6666297912598,
-        "y": 4910.080276489258,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "896e1959.7fd6a8"
-            ]
-        ]
-    },
-    {
-        "id": "dc960591.08f438",
-        "type": "set",
-        "name": "set rn-index to related network length",
-        "xml": "<set>\n<parameter name='rn-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network_length`' />\n",
-        "comments": "",
-        "x": 2083.3332176208496,
-        "y": 4861.080129623413,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "896e1959.7fd6a8",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>",
-        "comments": "",
-        "outputs": 1,
-        "x": 2178.6666297912598,
-        "y": 4910.080276489258,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "83542037.398bf"
-            ]
-        ]
-    },
-    {
-        "id": "83542037.398bf",
-        "type": "set",
-        "name": "set rn-index to 0",
-        "xml": "<set>\n<parameter name='rn-index' value='0' />\n",
-        "comments": "",
-        "x": 2338.6666297912598,
-        "y": 4910.080276489258,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "986e7ac7.81d148",
-        "type": "set",
-        "name": "set related-network data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].network-id'\n  value='`$tmp.AnAI-data.get-networks.results[0].l3-network.network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].network-role'\n  value='`$tmp.AnAI-data.get-networks.results[0].l3-network.network-role`' />\n",
-        "comments": "",
-        "x": 2486.3332862854004,
-        "y": 5020.747100830078,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "56b41d87.a09d94",
-        "type": "set",
-        "name": "set new related network length",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network_length'\n  value='`$rn-index + 1`' />\n",
-        "comments": "",
-        "x": 2048.6666984558105,
-        "y": 5164.080413818359,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "fbf7fa7c.23d608",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3398.6666984558105,
-        "y": 5136.080413818359,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "dc2e5d86.8c21f"
-            ]
-        ]
-    },
-    {
-        "id": "dc2e5d86.8c21f",
-        "type": "set",
-        "name": "set related-network data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.vlan-interface'\n  value='`$aai.vlan-tag.vlan-tag-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.upper-tag-id'\n  value='`$aai.vlan-tag.vlan-id-outer`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.lower-tag-id'\n  value='`$aai.vlan-tag.vlan-id-inner`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.is-private'\n  value='`$aai.vlan-tag.is-private`' />\n",
-        "comments": "",
-        "x": 3590.6666984558105,
-        "y": 5136.080413818359,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "1bf4c98d.f9c076",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 3168.6666984558105,
-        "y": 5174.080413818359,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "2f24f627.1d687a",
-        "type": "comment",
-        "name": "temporary data issue: also ignore string \"null\" and \"NULL\"",
-        "info": "",
-        "comments": "",
-        "x": 845.0000114440918,
-        "y": 4193.842397689819,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "83078563.934988",
-        "type": "outcome",
-        "name": "null",
-        "xml": "<outcome value='null'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 872.1428337097168,
-        "y": 4276.69953918457,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "15298732.e21cb9"
-            ]
-        ]
-    },
-    {
-        "id": "5dd2d1e7.b5782",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value='NULL'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 872.14284324646,
-        "y": 4319.556611061096,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "15298732.e21cb9"
-            ]
-        ]
-    },
-    {
-        "id": "36f653c4.5383bc",
-        "type": "switchNode",
-        "name": "switch input cloud-owner",
-        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 511.6666564941406,
-        "y": 232.41365242004395,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6073cd09.c47954",
-                "60806490.79275c"
-            ]
-        ]
-    },
-    {
-        "id": "6073cd09.c47954",
-        "type": "other",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 695.0000305175781,
-        "y": 202.41364097595215,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "a192c343.146f"
-            ]
-        ]
-    },
-    {
-        "id": "60806490.79275c",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 694.7619361877441,
-        "y": 243.3661346435547,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7907b.f03a3f85"
-            ]
-        ]
-    },
-    {
-        "id": "a192c343.146f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 829.9999847412109,
-        "y": 200.74698066711426,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7907b.f03a3f85",
-        "type": "set",
-        "name": "set prop.cloud-region.cloud-owner",
-        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\n",
-        "comments": "",
-        "x": 911.6666412353516,
-        "y": 242.4136619567871,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "16470885.0e3b37",
-        "type": "call",
-        "name": "call self-serve-vnf-forking-logic",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 529.523811340332,
-        "y": 525.7142963409424,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1caeb411.8cfeac",
-        "type": "switchNode",
-        "name": "switch ss.self-serve-flag",
-        "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 509.6665267944336,
-        "y": 691.2857837677002,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "37f74e26.cb2452",
-                "beba854c.d89668"
-            ]
-        ]
-    },
-    {
-        "id": "37f74e26.cb2452",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 721.3806838989258,
-        "y": 764.5710678100586,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c8588b9c.b0d898"
-            ]
-        ]
-    },
-    {
-        "id": "beba854c.d89668",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 720.9522018432617,
-        "y": 628.1429014205933,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "4645b056.44eb1"
-            ]
-        ]
-    },
-    {
-        "id": "97a46274.9df5e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 901.111141204834,
-        "y": 326.8888826370239,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "2a1c1eb.da980e2",
-                "22c02af2.d4ee26"
-            ]
-        ]
-    },
-    {
-        "id": "df6715d9.ce37d8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 901.111141204834,
-        "y": 375.46032428741455,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b8d206be.845728",
-                "22c02af2.d4ee26"
-            ]
-        ]
-    },
-    {
-        "id": "e48fe633.d5a078",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 903.9682579040527,
-        "y": 419.7460298538208,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "da0200d1.6944b",
-                "22c02af2.d4ee26"
-            ]
-        ]
-    },
-    {
-        "id": "2a1c1eb.da980e2",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVnfInstance'\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1137.539722442627,
-        "y": 326.88887310028076,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b8d206be.845728",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1136.1111335754395,
-        "y": 375.6031675338745,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "da0200d1.6944b",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1136.1111335754395,
-        "y": 419.74602031707764,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "198f8218.7133ee",
-        "type": "call",
-        "name": "call self-serve-vnf-assign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1171.9877891540527,
-        "y": 525.6072463989258,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d458bfd1.de073"
-            ]
-        ]
-    },
-    {
-        "id": "e83e7b2d.1d4268",
-        "type": "comment",
-        "name": "SELF-SERVE FORK",
-        "info": "",
-        "comments": "",
-        "x": 891.4285430908203,
-        "y": 579.011926651001,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "d458bfd1.de073",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1377.2853698730469,
-        "y": 525.0952777862549,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c261dd9e.7394e"
-            ]
-        ]
-    },
-    {
-        "id": "da6cb5e4.41c2f8",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 1142.7299880981445,
-        "y": 727.5396060943604,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "828a78b6.35b498",
-        "type": "set",
-        "name": "set vnf-level-oper-status to PendingCreate",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
-        "comments": "",
-        "x": 1235.099136352539,
-        "y": 577.099287033081,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "b15ef9f9.2e3088",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1134.3014526367188,
-        "y": 627.5390634536743,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4645b056.44eb1",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 911.5394134521484,
-        "y": 627.9999561309814,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "198f8218.7133ee",
-                "828a78b6.35b498",
-                "b15ef9f9.2e3088",
-                "da6cb5e4.41c2f8",
-                "86c22cc1.3260c"
-            ]
-        ]
-    },
-    {
-        "id": "6ec4e3b8.36b40c",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 1959.2064628601074,
-        "y": 777.6666669845581,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "ae382d33.4ff8e",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1978.5655097961426,
-        "y": 729.4661436080933,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "22c02af2.d4ee26",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1766.9843826293945,
-        "y": 752.7462320327759,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ae382d33.4ff8e",
-                "6ec4e3b8.36b40c"
-            ]
-        ]
-    },
-    {
-        "id": "c261dd9e.7394e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1553.301658630371,
-        "y": 525.2857141494751,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "6b697ba4.a67094",
-                "22c02af2.d4ee26"
-            ]
-        ]
-    },
-    {
-        "id": "6b697ba4.a67094",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1761.0795211791992,
-        "y": 497.19053077697754,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "86c22cc1.3260c",
-        "type": "configure",
-        "name": "send success to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"200\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1163.2539367675781,
-        "y": 673.6189651489258,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "853dab16.a11508",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2205.666618347168,
-        "y": 1201.666597366333,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e351344c.af7228",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Cannot find instance group id ' +\n      $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n      + ' in AAI'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1582.7617416381836,
-        "y": 1256.476245880127,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "564bf42f.5df9ac",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving instance-group from AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1582.761703491211,
-        "y": 1319.619031906128,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "33ec168e.11b45a",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find AAI relationship from collection '\n      + $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\n      + ' to service instance'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2177.333206176758,
-        "y": 1335.9523315429688,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "38b03742.d98548",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to get network service instance '\n      + $network-service-instance + ' from MD-SAL'`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2178.8094482421875,
-        "y": 1377.666732788086,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "56ab1164.7603f",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Could not find network instance group ' +\n      $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n      + ' in MD-SAL service instance '\n      + $network-service-instance`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2863.3335571289062,
-        "y": 1536.1904573440552,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "60b9af41.99ebd",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2778.095329284668,
-        "y": 1987.6192593574524,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "31b39cbf.523334",
-                "706a1140.f4bf2"
-            ]
-        ]
-    },
-    {
-        "id": "31b39cbf.523334",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2985.787551879883,
-        "y": 1964.894714832306,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "706a1140.f4bf2",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 2966.4285049438477,
-        "y": 2013.0952382087708,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "67d1f32e.64262c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2000.6664962768555,
-        "y": 1199.9998836517334,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "853dab16.a11508",
-                "60b9af41.99ebd"
-            ]
-        ]
-    },
-    {
-        "id": "3d4ce14c.b56fbe",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1370.999984741211,
-        "y": 1256.6664772033691,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "e351344c.af7228",
-                "60b9af41.99ebd"
-            ]
-        ]
-    },
-    {
-        "id": "6b5b96d7.f11058",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1371.666358947754,
-        "y": 1319.3331823349,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "564bf42f.5df9ac",
-                "60b9af41.99ebd"
-            ]
-        ]
-    },
-    {
-        "id": "75f0b66c.711368",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1959.9998779296875,
-        "y": 1336.3333625793457,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "33ec168e.11b45a",
-                "60b9af41.99ebd"
-            ]
-        ]
-    },
-    {
-        "id": "1cfc4c24.ab0124",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1958.333251953125,
-        "y": 1378.333251953125,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "38b03742.d98548",
-                "60b9af41.99ebd"
-            ]
-        ]
-    },
-    {
-        "id": "a3ec7ac.ac12b88",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2652.619094848633,
-        "y": 1536.9047193527222,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "56ab1164.7603f",
-                "60b9af41.99ebd"
-            ]
-        ]
-    },
-    {
-        "id": "da3712d9.f41f4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1459.0475540161133,
-        "y": 1771.9046249389648,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "62fa2d49.68c884",
-                "5de10e3b.8401c"
-            ]
-        ]
-    },
-    {
-        "id": "62fa2d49.68c884",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"No vnf-name was received but ecomp-generated-naming is not Y\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1688.90478515625,
-        "y": 1772.3329601287842,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6d7f13cc.8d975c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2211.9046783447266,
-        "y": 1875.7618045806885,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "4b15fa7b.a37b24",
-                "5de10e3b.8401c"
-            ]
-        ]
-    },
-    {
-        "id": "4b15fa7b.a37b24",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`$generate-unique-name-output.error-message`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2420.0475540161133,
-        "y": 1875.3331956863403,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "702e58b3.200b38",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2260.476104736328,
-        "y": 2001.9045372009277,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "20b0a05b.f52ee",
-                "5de10e3b.8401c"
-            ]
-        ]
-    },
-    {
-        "id": "20b0a05b.f52ee",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Unable to generate VNF name\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2483.3331604003906,
-        "y": 2002.3332080841064,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5de10e3b.8401c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2515.7144889831543,
-        "y": 2183.333490371704,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d15d28b1.ee4e78",
-                "5678e145.3766c"
-            ]
-        ]
-    },
-    {
-        "id": "d15d28b1.ee4e78",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2688.406749725342,
-        "y": 2162.2756242752075,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5678e145.3766c",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 2669.0477027893066,
-        "y": 2210.4761476516724,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "55ab3764.a14138",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 952.8571090698242,
-        "y": 2912.2857341766357,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f054f599.b671b8",
-                "2115eaa4.e5b146"
-            ]
-        ]
-    },
-    {
-        "id": "f054f599.b671b8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Cloud region not found in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1151.428451538086,
-        "y": 2878.0000200271606,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cbecda63.60f978",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 956.1904602050781,
-        "y": 2955.619020462036,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "7ff32092.da86f",
-                "2115eaa4.e5b146"
-            ]
-        ]
-    },
-    {
-        "id": "7ff32092.da86f",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving cloud region from AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1154.7618026733398,
-        "y": 2921.333306312561,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9a466e25.4156f",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 814.5238952636719,
-        "y": 3134.619167327881,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9a766ef3.dad01",
-                "2115eaa4.e5b146"
-            ]
-        ]
-    },
-    {
-        "id": "9a766ef3.dad01",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1024.5238876342773,
-        "y": 3113.190655708313,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b319ef18.b3bad",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 1805.047737121582,
-        "y": 6390.475831985474,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "87f91dc6.de07b",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1822.692756652832,
-        "y": 6342.751573562622,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2115eaa4.e5b146",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1932.8570709228516,
-        "y": 3718.5708351135254,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "c740bc4.11d1e4",
-                "d11043da.a1cb",
-                "acdf260b.352908",
-                "a74a208c.91738"
-            ]
-        ]
-    },
-    {
-        "id": "d11043da.a1cb",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2311.428497314453,
-        "y": 3693.71373295784,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c740bc4.11d1e4",
-        "type": "set",
-        "name": "set variables for deleting name",
-        "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
-        "comments": "",
-        "x": 2212.8571166992188,
-        "y": 3646.5708038806915,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "65833.6b4487cd8",
-        "type": "comment",
-        "name": "Unassign the VNF name",
-        "info": "",
-        "comments": "",
-        "x": 2230.238021850586,
-        "y": 3592.856448173523,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "a74a208c.91738",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 2152.190605163574,
-        "y": 3789.7289028167725,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "acdf260b.352908",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2169.835624694824,
-        "y": 3742.004644393921,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5be8614b.d2283",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1099.9999923706055,
-        "y": 3224.714331626892,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "8a74d4c9.f4d158",
-                "2115eaa4.e5b146"
-            ]
-        ]
-    },
-    {
-        "id": "8a74d4c9.f4d158",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_TO_NETWORK_ROLE_MAPPING table\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1302.8571014404297,
-        "y": 3191.8572273254395,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1b9558ce.3c84a7",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1669.9999465942383,
-        "y": 3434.285619735718,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "f01f3cd.81c20c",
-                "2115eaa4.e5b146"
-            ]
-        ]
-    },
-    {
-        "id": "f01f3cd.81c20c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1881.4285507202148,
-        "y": 3402.8569107055664,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f361b5ff.f38548",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2690.4761276245117,
-        "y": 4655.667684555054,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "87fd5071.f5e61",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "87fd5071.f5e61",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`\n    'Error retrieving network-topology-identifier-structure for service instance '\n    + $network-service-instance-id\n    + ' and network-id '\n    + $l3-network-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2901.9046325683594,
-        "y": 4624.238899230957,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c3080a54.9b9f68",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1803.1428604125977,
-        "y": 4496.048126220703,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "67128ab5.195dd4",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "67128ab5.195dd4",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VNF_RELATED_NETWORK_ROLE table\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2017.1428604125977,
-        "y": 4477.190979003906,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b897f854.8a4f58",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2447.6190872192383,
-        "y": 4771.667268753052,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "90365fab.e2211",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "90365fab.e2211",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error getting owning entity from service instance\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2654.762107849121,
-        "y": 4747.381650924683,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a1cce433.a5c9a8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2462.6190872192383,
-        "y": 4816.667268753052,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "1a20c9fe.aa7526",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "1a20c9fe.aa7526",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Unable to find owning entity from service instance\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2664.0477294921875,
-        "y": 4790.953462600708,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3e5e2886.704ec8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2906.6664810180664,
-        "y": 4942.143200874329,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "474a1c8f.5b8254",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "474a1c8f.5b8254",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error calling getNetworks custom query in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3122.380844116211,
-        "y": 4912.143190383911,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fb3762dd.d74d3",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2918.3332290649414,
-        "y": 4987.143200874329,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "d13c17c6.96baa8",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "d13c17c6.96baa8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No l3-network returned from getNetworks custom query for related network role '\n      + $db.vnf-related-network-role[0].related-network-role`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3134.047592163086,
-        "y": 4957.143190383911,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cf0cc9f2.e1c008",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3562.618698120117,
-        "y": 5088.333766937256,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "583a5088.c3e55",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "583a5088.c3e55",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error getting vlan-tag object from AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3775.475830078125,
-        "y": 5061.190900802612,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9615c407.df8ac8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3693.0952529907227,
-        "y": 5414.525018692017,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "48c15a99.5b8364",
-                "981b8897.27de98",
-                "b2a30503.c3f7c8",
-                "c725031e.3faf3"
-            ]
-        ]
-    },
-    {
-        "id": "c725031e.3faf3",
-        "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-message`\" />\n",
-        "comments": "",
-        "x": 3903.8097076416016,
-        "y": 5474.253993988037,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "b2a30503.c3f7c8",
-        "type": "configure",
-        "name": "send error to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"500\" />\n<parameter name=\"input.response-message\" value=\"`$error-message`\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3923.168746948242,
-        "y": 5429.38673210144,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "981b8897.27de98",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4059.0476684570312,
-        "y": 5383.238904953003,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "48c15a99.5b8364",
-        "type": "set",
-        "name": "set variables for deleting name",
-        "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
-        "comments": "",
-        "x": 3960.476287841797,
-        "y": 5336.0959758758545,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "4fcc2ec6.5268d",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1669.9999313354492,
-        "y": 3484.2856159210205,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "75ca8e5d.ce23a",
-                "2115eaa4.e5b146"
-            ]
-        ]
-    },
-    {
-        "id": "75ca8e5d.ce23a",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving l3-network from AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1881.4285354614258,
-        "y": 3452.856906890869,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "39a027a0.277908",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1805.71435546875,
-        "y": 4195.714210510254,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d03cff5b.4eae8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1605.71435546875,
-        "y": 4210,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "39a027a0.277908",
-                "9615c407.df8ac8"
-            ]
-        ]
-    },
-    {
-        "id": "bb9178af.635d68",
-        "type": "comment",
-        "name": "Unassign the VNF name",
-        "info": "",
-        "comments": "",
-        "x": 3824.285888671875,
-        "y": 5262.857421875,
-        "z": "2d523017.81121",
-        "wires": []
-    },
-    {
-        "id": "63585eee.6f434",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1259.9999389648438,
-        "y": 5382.856773376465,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "2dd248fd.0355f8",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "2dd248fd.0355f8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No availability zones found in AAI for cloud region '\n       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1462.8570709228516,
-        "y": 5364.28534412384,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ac3d2a38.193128",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1487.3811264038086,
-        "y": 5509.524040222168,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "fcb662f2.e888c",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "fcb662f2.e888c",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1688.8096771240234,
-        "y": 5489.524041175842,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "edd6eeb3.58833",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1489.047752380371,
-        "y": 5552.857048034668,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "ed7e59f3.736ce8",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "ed7e59f3.736ce8",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1690.476303100586,
-        "y": 5532.857048988342,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1d23943a.cc401c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1346.904800415039,
-        "y": 5627.618696212769,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5db8f40e.5238ec",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "5db8f40e.5238ec",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1544.5833358764648,
-        "y": 5606.011522293091,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "48b115c8.09c9bc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1366.9642944335938,
-        "y": 5672.678614616394,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "33966a0a.bc1c26",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "33966a0a.bc1c26",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1571.2500610351562,
-        "y": 5649.821611404419,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b5f5454e.605518",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 782.6785583496094,
-        "y": 5782.29768371582,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "5a2cf836.80cc88",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "5a2cf836.80cc88",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating selflink in generic-vnf in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 988.3928985595703,
-        "y": 5758.011829376221,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fb7909b7.07d3a8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 796.0118713378906,
-        "y": 5825.63117980957,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "840ebe47.1002a",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "840ebe47.1002a",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1001.7262115478516,
-        "y": 5801.345325469971,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b5b87fb0.590f",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1376.059555053711,
-        "y": 5875.011758804321,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "9605363d.80ae88",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "9605363d.80ae88",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating relationship in generic-vnf in AAI\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1570.3452758789062,
-        "y": 5849.2977504730225,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "610d2304.a3d70c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1391.059555053711,
-        "y": 5918.345254898071,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "70fd7745.526758",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "70fd7745.526758",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1585.3452758789062,
-        "y": 5892.6312465667725,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b01ba289.b4c4d",
-        "type": "execute",
-        "name": "execute RestApiCallNode - PUT vnf",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + 'vnf-data-assign.json'`\" />\n    <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.vnf.url`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"vnf-assign\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 477.2378692626953,
-        "y": 6091.738591194153,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "b8a25bcd.5c5768",
-                "336fda4d.6f39d6"
-            ]
-        ]
-    },
-    {
-        "id": "b8a25bcd.5c5768",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 724.4506301879883,
-        "y": 6113.069312095642,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "dd704ec0.5452"
-            ]
-        ]
-    },
-    {
-        "id": "336fda4d.6f39d6",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 716.879264831543,
-        "y": 6071.569332122803,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "dd704ec0.5452"
-            ]
-        ]
-    },
-    {
-        "id": "dd704ec0.5452",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 892.475944519043,
-        "y": 6091.499786376953,
-        "z": "2d523017.81121",
-        "wires": [
-            [
-                "70b79c9a.11b3d4",
-                "f54d4b54.f29d58"
-            ]
-        ]
-    },
-    {
-        "id": "70b79c9a.11b3d4",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error doing PUT of vnf-data\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1098.1902542114258,
-        "y": 6057.213903427124,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ebd11f4a.d9ea2",
-        "type": "configure",
-        "name": "send success to MSO",
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"__READ_FROM_PARAMETERS__\">\n<parameter name=\"notification-url\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"input.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"input.response-code\" value=\"200\" />\n<parameter name=\"input.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"input.service-information.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"input.service-information.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 423.1902313232422,
-        "y": 6242.214249610901,
-        "z": "2d523017.81121",
-        "wires": [
-            []
-        ]
-    }
-]
-\ No newline at end of file
+[{"id":"fc72a566.b030f8","type":"dgstart","name":"DGSTART","outputs":1,"x":114.28571319580078,"y":82.17556571960449,"z":"be5d0074.91504","wires":[["d7ff7ece.9b8e2"]]},{"id":"d7ff7ece.9b8e2","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":229.57141876220703,"y":124.0803451538086,"z":"be5d0074.91504","wires":[["86d59967.1a7618"]]},{"id":"86d59967.1a7618","type":"method","name":"method vnf-topology-operation-assign","xml":"<method rpc='vnf-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":202.38101959228516,"y":166.84222888946533,"z":"be5d0074.91504","wires":[["f09bed97.7d31e"]]},{"id":"f954a196.dc25a","type":"comment","name":"vnf-topology-operation-assign","info":"","comments":"","x":490.2972412109375,"y":31.428569793701172,"z":"be5d0074.91504","wires":[]},{"id":"e5ad0d66.70637","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":500.66666412353516,"y":315.31839752197266,"z":"be5d0074.91504","wires":[["5916492b.857218","c1cdea93.bfa138"]]},{"id":"5916492b.857218","type":"outcome","name":"CreateVnfInstance","xml":"<outcome value='CreateVnfInstance'>\n","comments":"","outputs":1,"x":754.3809585571289,"y":292.4612789154053,"z":"be5d0074.91504","wires":[["391acb58.1c59b4"]]},{"id":"c1cdea93.bfa138","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":716.3809242248535,"y":338.1756067276001,"z":"be5d0074.91504","wires":[["f4427afa.1c8c48"]]},{"id":"391acb58.1c59b4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":939.2380867004395,"y":292.4613084793091,"z":"be5d0074.91504","wires":[[]]},{"id":"f4427afa.1c8c48","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVnfInstance'\" />\n","comments":"","x":956.380931854248,"y":338.1755647659302,"z":"be5d0074.91504","wires":[]},{"id":"7362746e.83534c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":172.02385711669922,"y":3364.199432373047,"z":"be5d0074.91504","wires":[["320c139b.584b8c","bf64681.3327098","3decabb0.b19304","dfde25aa.22eb48","b3fdadba.ac878","9295f3a8.889f","6652c3ec.51eebc","8297bb69.b2a948","e85c7ed0.15ed6","986025fa.476b28","adadb322.2ebc2","4a499d99.17dc24","f6338637.0f4ab8","4abfb941.f3ffe8","c49cd790.366c28","af081865.1577e8","5b608bb1.3093a4","b8bea347.ec5d","e79aac59.803e","a7739265.64c59","352a2229.74292e","74128bae.fef6c4","a5a33888.67fae8","9393d0c7.d77e9","e6df8bdc.9062b8","9dcdbace.684eb8","fc6ad87e.cad2c8","bd2ebb93.969ad8","9523ee9.421ab1","59afdec8.0d6fc","2c4a61bc.2ff89e","58eda9a2.3858f8","e984610a.8e6fd","7a50c9f.bf28538"]]},{"id":"95e7dc2c.60081","type":"get-resource","name":"get-resource VF_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-model'>\n\n","comments":"","outputs":1,"x":512.9999694824219,"y":406.4612674713135,"z":"be5d0074.91504","wires":[["84af2cd0.e814a","c4d8b439.0a4f08"]]},{"id":"b7c7ad28.59134","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />\n","comments":"","x":954.4284477233887,"y":429.8897533416748,"z":"be5d0074.91504","wires":[]},{"id":"84af2cd0.e814a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":713.7856674194336,"y":386.8421049118042,"z":"be5d0074.91504","wires":[["47443e13.3d07b"]]},{"id":"c4d8b439.0a4f08","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":722.3570976257324,"y":431.127818107605,"z":"be5d0074.91504","wires":[["b7c7ad28.59134"]]},{"id":"47443e13.3d07b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n","comments":"","x":953.7856483459473,"y":384.98501205444336,"z":"be5d0074.91504","wires":[]},{"id":"320c139b.584b8c","type":"switchNode","name":"switch service-data.vnfs.vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":546.666633605957,"y":1157.4137020111084,"z":"be5d0074.91504","wires":[["10c4a3ac.27e12c","7ee20af4.b60b24"]]},{"id":"10c4a3ac.27e12c","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":772.3809623718262,"y":1124.556489944458,"z":"be5d0074.91504","wires":[["15231b53.df2ce5"]]},{"id":"15231b53.df2ce5","type":"set","name":"set vnf-index=0","xml":"<set>\n<parameter name='vnf-index' value='0' />\n","comments":"","x":936.6666831970215,"y":1123.556568145752,"z":"be5d0074.91504","wires":[]},{"id":"7ee20af4.b60b24","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":773.8095245361328,"y":1188.8423080444336,"z":"be5d0074.91504","wires":[["ce5c34bd.216b68"]]},{"id":"4125e058.075d9","type":"set","name":"set vnf-index = vnf_length","xml":"<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n","comments":"","x":1112.6666793823242,"y":1167.1279964447021,"z":"be5d0074.91504","wires":[]},{"id":"75e24b9d.3e0b14","type":"for","name":"for each existing VNF","xml":"<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":1098.0951919555664,"y":1213.127935409546,"z":"be5d0074.91504","wires":[["1888808a.4f9fff"]]},{"id":"ce5c34bd.216b68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":909.5237846374512,"y":1188.8422737121582,"z":"be5d0074.91504","wires":[["4125e058.075d9","75e24b9d.3e0b14"]]},{"id":"1888808a.4f9fff","type":"switchNode","name":"switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n","comments":"","outputs":1,"x":1452.380958557129,"y":1212.6994152069092,"z":"be5d0074.91504","wires":[["f2252759.7fe8e8"]]},{"id":"f2252759.7fe8e8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1746.6667137145996,"y":1212.270899772644,"z":"be5d0074.91504","wires":[["e8e7a328.f78eb"]]},{"id":"e8e7a328.f78eb","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists'`\" />\n","comments":"","x":1895.2380752563477,"y":1212.2708473205566,"z":"be5d0074.91504","wires":[]},{"id":"b5747a8b.62e2a8","type":"comment","name":"make sure this VNF doesn't exist already","info":"","comments":"","x":1439.5236892700195,"y":1170.270845413208,"z":"be5d0074.91504","wires":[]},{"id":"bf64681.3327098","type":"set","name":"set vnf-topology data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n","comments":"","x":512.380916595459,"y":1689.0804691314697,"z":"be5d0074.91504","wires":[]},{"id":"3decabb0.b19304","type":"switchNode","name":"switch input vnf-name","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.vnf-name`'>\n","comments":"","outputs":1,"x":524.8809356689453,"y":2051.199526786804,"z":"be5d0074.91504","wires":[["5709eb79.187104","cfdd3602.799058"]]},{"id":"dfde25aa.22eb48","type":"get-resource","name":"get-resource cloud region","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"cloud-region\" \n\t\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \n\t\t     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region AND\n\t\t     depth='all'\"\n        pfx='aai.cloud-region' local-only='false' >\n\n","comments":"","outputs":1,"x":557.0238800048828,"y":2947.1992626190186,"z":"be5d0074.91504","wires":[["c639d1a9.1cea1","5e574489.17530c"]]},{"id":"5e574489.17530c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":782.2700729370117,"y":2965.350118637085,"z":"be5d0074.91504","wires":[["76478117.63a79"]]},{"id":"fd97eb04.7d1378","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 retrieving cloud region from AAI\" />\n","comments":"","x":1083.9367446899414,"y":2965.3501358032227,"z":"be5d0074.91504","wires":[]},{"id":"c639d1a9.1cea1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":791.1986694335938,"y":2923.6358518600464,"z":"be5d0074.91504","wires":[["8730c02a.4d9e7"]]},{"id":"7181fd4f.3b9314","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=\"Cloud region not found in AAI\" />\n","comments":"","x":1084.2146453857422,"y":2922.9414100646973,"z":"be5d0074.91504","wires":[]},{"id":"b3fdadba.ac878","type":"get-resource","name":"get-resource VF_TO_NETWORK_ROLE_MAPPING","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-network-role-mapping[]'>\n\n","comments":"","outputs":1,"x":622.261962890625,"y":3258.2467823028564,"z":"be5d0074.91504","wires":[["e55086cc.fe7c38","bada4af8.48ee18"]]},{"id":"e55086cc.fe7c38","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":918.0476341247559,"y":3236.960947036743,"z":"be5d0074.91504","wires":[["6e98f691.cd8c98"]]},{"id":"bada4af8.48ee18","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":926.6190643310547,"y":3281.246660232544,"z":"be5d0074.91504","wires":[["31b1e600.94057a"]]},{"id":"7d5b4659.62fc88","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_TO_NETWORK_ROLE_MAPPING table\" />\n","comments":"","x":1234.7142581939697,"y":3236.770679473877,"z":"be5d0074.91504","wires":[]},{"id":"7eca1a93.00ad54","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1029.8573684692383,"y":4001.555992126465,"z":"be5d0074.91504","wires":[["aa84ca7f.755948","44cbbbb1.3a7de4","78423903.e2ed08","acfaeeda.3fa36","9940e480.cc5ae8","7c99cdf1.d6d3e4","faee63b4.f8527","6a145c65.18a254","dece7ac8.98c8e8"]]},{"id":"78423903.e2ed08","type":"get-resource","name":"get-resource l3-network","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-networks\" \n\t\tkey=\"l3-network.network-role = $db.vf-network-role-mapping[$role-index].network-role\"\n        pfx='aai.l3-network' local-only='false'\n>\n","comments":"","outputs":1,"x":1286.714443206787,"y":3410.508596420288,"z":"be5d0074.91504","wires":[["d521574d.066048","bddb9f8e.bb902"]]},{"id":"bddb9f8e.bb902","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1490.7621574401855,"y":3432.651435852051,"z":"be5d0074.91504","wires":[["fac96d9.7296c9"]]},{"id":"bf85b613.22da88","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 retrieving l3-network from AAI\" />\n","comments":"","x":1805.7621879577637,"y":3432.98477935791,"z":"be5d0074.91504","wires":[]},{"id":"d521574d.066048","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1499.6907539367676,"y":3390.937169075012,"z":"be5d0074.91504","wires":[["15b5633e.00b0bd"]]},{"id":"24c9dca7.afc914","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No active l3-network found in AAI with cloud_region_id '\n          + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '\n          + $db.vf-network-role-mapping[$network-index].network-role`\" />\n","comments":"","x":1804.3733835220337,"y":3391.9093055725098,"z":"be5d0074.91504","wires":[]},{"id":"aa84ca7f.755948","type":"set","name":"set vnf-network data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'\n    value='`$db.vf-network-role-mapping[$role-index].network-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'\n    value='`$aai.l3-network.l3-network[$db-network-index].network-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'\n    value='`$aai.l3-network.l3-network[$db-network-index].neutron-network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'\n    value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'\n    value='`$aai.l3-network.l3-network[$db-network-index].contrail-network-fqdn`' />\n","comments":"","x":1275.9050331115723,"y":3897.5088396072388,"z":"be5d0074.91504","wires":[]},{"id":"e85c7ed0.15ed6","type":"for","name":"for each cloud-region availability zone","xml":"<for index='idx' start='0' end='`$aai.cloud-region.availability-zones.availability-zone_length`' >\n","comments":"","outputs":1,"x":496.28607177734375,"y":5144.627817153931,"z":"be5d0074.91504","wires":[["55cdaf47.06229"]]},{"id":"61de414e.afb53","type":"set","name":"set availability-zone","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[$idx]'\n  value='`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`' />\n","comments":"","x":957.9527549743652,"y":5113.961231231689,"z":"be5d0074.91504","wires":[]},{"id":"986025fa.476b28","type":"set","name":"set vnf-parameters-data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n","comments":"","x":455.9049987792969,"y":4994.580177307129,"z":"be5d0074.91504","wires":[]},{"id":"788d0393.74592c","type":"save","name":"save generic-vnf l3-network relationships","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`\" />\n","comments":"","outputs":1,"x":922.4765319824219,"y":5288.390029907227,"z":"be5d0074.91504","wires":[["bf1f1d79.7018b","1454f72a.725d29"]]},{"id":"f6338637.0f4ab8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":415.7145462036133,"y":5754.00841999054,"z":"be5d0074.91504","wires":[]},{"id":"4a499d99.17dc24","type":"set","name":"set vnf-level-oper-status to PendingCreate","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n","comments":"","x":505.52799224853516,"y":5656.3459005355835,"z":"be5d0074.91504","wires":[]},{"id":"6652c3ec.51eebc","type":"for","name":"for each network-role","xml":"<for silentFailure='true' index='role-index' start='0' end='`$db.vf-network-role-mapping_length`'>","comments":"","outputs":1,"x":489.85730361938477,"y":3974.889660835266,"z":"be5d0074.91504","wires":[["80cab39e.772be"]]},{"id":"9295f3a8.889f","type":"set","name":"set network-index = 0","xml":"<set>\n<parameter name='network-index' value='0' />\n","comments":"","x":524.6904602050781,"y":3312.2945766448975,"z":"be5d0074.91504","wires":[]},{"id":"44cbbbb1.3a7de4","type":"set","name":"increment network-index","xml":"<set>\n<parameter name='network-index' value='`$network-index + 1`' />\n","comments":"","x":1257.9050216674805,"y":4945.2707805633545,"z":"be5d0074.91504","wires":[]},{"id":"8297bb69.b2a948","type":"set","name":"set vnf-network_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length'\n  value='`$network-index`' />\n","comments":"","x":454.7620849609375,"y":4944.5802211761475,"z":"be5d0074.91504","wires":[]},{"id":"adadb322.2ebc2","type":"set","name":"copy input data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n","comments":"","x":421.0478210449219,"y":5604.008731842041,"z":"be5d0074.91504","wires":[]},{"id":"4abfb941.f3ffe8","type":"for","name":"for each vnf-network","xml":"<for index='vnf-nw-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length`' >\n","comments":"","outputs":1,"x":445.4764404296875,"y":5287.389945983887,"z":"be5d0074.91504","wires":[["46f396dd.851888"]]},{"id":"46f396dd.851888","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":649.1430816650391,"y":5287.38990688324,"z":"be5d0074.91504","wires":[["788d0393.74592c"]]},{"id":"c49cd790.366c28","type":"set","name":"set new vnf_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n","comments":"","x":495.30955505371094,"y":1209.4375925064087,"z":"be5d0074.91504","wires":[]},{"id":"af081865.1577e8","type":"for","name":"for each cloud-region relationship","xml":"<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":569.8810043334961,"y":3034.437434196472,"z":"be5d0074.91504","wires":[["11d114a7.11d1db"]]},{"id":"11d114a7.11d1db","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n","comments":"","outputs":1,"x":817.5595474243164,"y":3034.1873636245728,"z":"be5d0074.91504","wires":[["91385fad.fb26d"]]},{"id":"91385fad.fb26d","type":"outcome","name":"complex","xml":"<outcome value='complex'>\n","comments":"","outputs":1,"x":987.023868560791,"y":3033.5801858901978,"z":"be5d0074.91504","wires":[["8ea9283d.520568"]]},{"id":"58064897.8348d8","type":"set","name":"set aic-clli","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli'\n  value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\n","comments":"","x":1307.738166809082,"y":3033.2468433380127,"z":"be5d0074.91504","wires":[]},{"id":"5b608bb1.3093a4","type":"switchNode","name":"switch aic-clli","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>\n","comments":"","outputs":1,"x":502.9286308288574,"y":3147.5325660705566,"z":"be5d0074.91504","wires":[["666489c1.6451d8"]]},{"id":"666489c1.6451d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":651.0714645385742,"y":3147.532548904419,"z":"be5d0074.91504","wires":[["b5eeb045.601e6"]]},{"id":"c1a2c00.3db054","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=\"`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n","comments":"","x":941.5476570129395,"y":3148.770594596863,"z":"be5d0074.91504","wires":[]},{"id":"5f373e69.1c378","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n","comments":"","x":929.381175994873,"y":2506.3898229599,"z":"be5d0074.91504","wires":[]},{"id":"f92de18c.da037","type":"for","name":"for each l3-network","xml":"<for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\n","comments":"","outputs":1,"x":1396.1670112609863,"y":3722.0802183151245,"z":"be5d0074.91504","wires":[["ad1cc61a.69a3c8"]]},{"id":"88980c13.6b138","type":"switchNode","name":"switch orchestration-status","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\n","comments":"","outputs":1,"x":1814.738182067871,"y":3656.6516828536987,"z":"be5d0074.91504","wires":[["8046ef6.5d6361","2b1aef5d.2b5eb","7307dfa0.46d7a","b7e26b2.86dc498","ef62ae9c.ffcbb"]]},{"id":"8046ef6.5d6361","type":"outcome","name":"Pending Delete","xml":"<outcome value='Pending Delete'>\n","comments":"","outputs":1,"x":2055.4050521850586,"y":3698.3181867599487,"z":"be5d0074.91504","wires":[["4f9a1482.90979c"]]},{"id":"2b1aef5d.2b5eb","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2028.262191772461,"y":3749.3181676864624,"z":"be5d0074.91504","wires":[["a0a467e4.42d7e8"]]},{"id":"427d1cc0.bee434","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\n","comments":"","outputs":1,"x":2563.976493835449,"y":3694.5560846328735,"z":"be5d0074.91504","wires":[["1cb8d77e.84dfa9","6a38ac3.c275454"]]},{"id":"a0a467e4.42d7e8","type":"for","name":"for each relationship","xml":"<for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":2198.262104034424,"y":3748.8895444869995,"z":"be5d0074.91504","wires":[["a31baa94.b136c8"]]},{"id":"1cb8d77e.84dfa9","type":"outcome","name":"cloud-region","xml":"<outcome value='cloud-region'>\n","comments":"","outputs":1,"x":2738.262279510498,"y":3717.4609088897705,"z":"be5d0074.91504","wires":[["3bc3eb78.45d084"]]},{"id":"3bc3eb78.45d084","type":"for","name":"for each relationship data","xml":"<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n","comments":"","outputs":1,"x":2935.4049797058105,"y":3717.88937664032,"z":"be5d0074.91504","wires":[["504faaa9.14ab54"]]},{"id":"504faaa9.14ab54","type":"switchNode","name":"switch relationship-key","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n","comments":"","outputs":1,"x":3166.83358001709,"y":3717.4607515335083,"z":"be5d0074.91504","wires":[["5f887ea8.86a72"]]},{"id":"5f887ea8.86a72","type":"outcome","name":"cloud-region.cloud-region-id","xml":"<outcome value='cloud-region.cloud-region-id'>\n","comments":"","outputs":1,"x":3408.2621459960938,"y":3717.4608478546143,"z":"be5d0074.91504","wires":[["d414e376.8b4e6"]]},{"id":"d414e376.8b4e6","type":"switchNode","name":"switch relationship-value == cloud-region-id","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":3712.548065185547,"y":3717.3179035186768,"z":"be5d0074.91504","wires":[["d7a36632.ac12f8"]]},{"id":"d7a36632.ac12f8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3417.5482025146484,"y":3834.9608573913574,"z":"be5d0074.91504","wires":[["a291152a.934e78"]]},{"id":"acfaeeda.3fa36","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1232.3811836242676,"y":3653.3658628463745,"z":"be5d0074.91504","wires":[["f92de18c.da037","3d04abe8.1b48a4"]]},{"id":"9940e480.cc5ae8","type":"set","name":"set l3-network-id = -1","xml":"<set>\n<parameter name='l3-network-id' value='-1' />\n","comments":"","x":1276.714542388916,"y":3525.270516395569,"z":"be5d0074.91504","wires":[]},{"id":"a291152a.934e78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3563.3811798095703,"y":3834.436965942383,"z":"be5d0074.91504","wires":[["324a1628.f30e8a","dfefb0c6.308d5","e7b2f268.9efeb"]]},{"id":"324a1628.f30e8a","type":"set","name":"set l3-network-id = this l3-network","xml":"<set>\n<parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n","comments":"","x":3798.61918258667,"y":3796.5799350738525,"z":"be5d0074.91504","wires":[]},{"id":"7c99cdf1.d6d3e4","type":"switchNode","name":"switch l3-network-id","xml":"<switch test='`$l3-network-id`'>\n","comments":"","outputs":1,"x":1273.7144660949707,"y":3848.9375581741333,"z":"be5d0074.91504","wires":[["60ad7ff9.df75f"]]},{"id":"60ad7ff9.df75f","type":"outcome","name":"-1","xml":"<outcome value='-1'>\n","comments":"","outputs":1,"x":1443.7144165039062,"y":3848.9373140335083,"z":"be5d0074.91504","wires":[["f42827cf.7bebd8"]]},{"id":"bd21a4ce.761328","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=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n","comments":"","x":1727.047779083252,"y":3848.937562942505,"z":"be5d0074.91504","wires":[]},{"id":"b8bea347.ec5d","type":"switchNode","name":"switch input model-invariant-uuid","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n","comments":"","outputs":1,"x":573.2382507324219,"y":2529.2142667770386,"z":"be5d0074.91504","wires":[["cb62cb5c.4fa7c8","883fb8ea.0c5668"]]},{"id":"cb62cb5c.4fa7c8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":778.9049224853516,"y":2506.3572301864624,"z":"be5d0074.91504","wires":[["5f373e69.1c378"]]},{"id":"883fb8ea.0c5668","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":780.3335189819336,"y":2550.6428213119507,"z":"be5d0074.91504","wires":[["974e102f.cb3d3"]]},{"id":"974e102f.cb3d3","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n","comments":"","x":934.619255065918,"y":2550.0713934898376,"z":"be5d0074.91504","wires":[]},{"id":"3c543c1a.6113b4","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n","comments":"","x":930.3334465026855,"y":2594.9284992218018,"z":"be5d0074.91504","wires":[]},{"id":"e79aac59.803e","type":"switchNode","name":"switch input model-uuid","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n","comments":"","outputs":1,"x":545.8572692871094,"y":2617.7530040740967,"z":"be5d0074.91504","wires":[["58af875e.965798","3c85d965.5cbc86"]]},{"id":"58af875e.965798","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":779.8572425842285,"y":2594.895936012268,"z":"be5d0074.91504","wires":[["3c543c1a.6113b4"]]},{"id":"3c85d965.5cbc86","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":781.2858390808105,"y":2639.1815271377563,"z":"be5d0074.91504","wires":[["19910291.706c9d"]]},{"id":"19910291.706c9d","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n","comments":"","x":935.5715751647949,"y":2638.6100993156433,"z":"be5d0074.91504","wires":[]},{"id":"93a12bb2.72bdf8","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n","comments":"","x":927.4763793945312,"y":2683.7857065200806,"z":"be5d0074.91504","wires":[]},{"id":"a7739265.64c59","type":"switchNode","name":"switch input model-version","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n","comments":"","outputs":1,"x":554.0001411437988,"y":2706.6101512908936,"z":"be5d0074.91504","wires":[["e067afd9.9bc37","29999425.8a840c"]]},{"id":"e067afd9.9bc37","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":777.0001258850098,"y":2683.753113746643,"z":"be5d0074.91504","wires":[["93a12bb2.72bdf8"]]},{"id":"29999425.8a840c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":778.4287223815918,"y":2728.0387048721313,"z":"be5d0074.91504","wires":[["80a13eef.bb832"]]},{"id":"80a13eef.bb832","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n","comments":"","x":932.7144584655762,"y":2727.4672770500183,"z":"be5d0074.91504","wires":[]},{"id":"c45acb30.4dc358","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n","comments":"","x":927.4763793945312,"y":2770.9285287857056,"z":"be5d0074.91504","wires":[]},{"id":"352a2229.74292e","type":"switchNode","name":"switch input model-name","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n","comments":"","outputs":1,"x":549.0001411437988,"y":2793.7529735565186,"z":"be5d0074.91504","wires":[["851d518.15311b","26141566.38776a"]]},{"id":"851d518.15311b","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":777.0001258850098,"y":2770.895936012268,"z":"be5d0074.91504","wires":[["c45acb30.4dc358"]]},{"id":"26141566.38776a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":778.4287223815918,"y":2815.1815271377563,"z":"be5d0074.91504","wires":[["3a99b56f.3b843a"]]},{"id":"3a99b56f.3b843a","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n","comments":"","x":932.7144584655762,"y":2814.6100993156433,"z":"be5d0074.91504","wires":[]},{"id":"4f9a1482.90979c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2208.6191444396973,"y":3699.095064163208,"z":"be5d0074.91504","wires":[[]]},{"id":"ef62ae9c.ffcbb","type":"outcome","name":"PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":2053.285785675049,"y":3654.0949783325195,"z":"be5d0074.91504","wires":[["a847b1f1.05529"]]},{"id":"a847b1f1.05529","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2208.4998779296875,"y":3654.871855735779,"z":"be5d0074.91504","wires":[[]]},{"id":"b7e26b2.86dc498","type":"outcome","name":"Pending Create","xml":"<outcome value='Pending Create'>\n","comments":"","outputs":1,"x":2055.285785675049,"y":3610.7614822387695,"z":"be5d0074.91504","wires":[["911dd764.0af6d8"]]},{"id":"911dd764.0af6d8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2208.4998779296875,"y":3611.538359642029,"z":"be5d0074.91504","wires":[[]]},{"id":"7307dfa0.46d7a","type":"outcome","name":"PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":2055.285785675049,"y":3567.4282302856445,"z":"be5d0074.91504","wires":[["b2b7ea62.09e978"]]},{"id":"b2b7ea62.09e978","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2208.4998779296875,"y":3568.205107688904,"z":"be5d0074.91504","wires":[[]]},{"id":"705a058a.b98a8c","type":"for","name":"for each A&AI subnet","xml":"<for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' >\n","comments":"","outputs":1,"x":1741.6668128967285,"y":3988.1423993110657,"z":"be5d0074.91504","wires":[["26bcf61d.39ed8a"]]},{"id":"84cd03b2.470d3","type":"set","name":"set subnet_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' />\n","comments":"","x":1730.3333778381348,"y":4033.142481327057,"z":"be5d0074.91504","wires":[]},{"id":"74128bae.fef6c4","type":"set","name":"set availability-zones.max-count and length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.max-count'\n   value='`$db.vf-model.avail-zone-max-count`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone_length'\n   value='`$aai.cloud-region.availability-zones.availability-zone_length`' />\n","comments":"","x":515.9525756835938,"y":5232.6432847976685,"z":"be5d0074.91504","wires":[]},{"id":"a5a33888.67fae8","type":"set","name":"set vnf-name","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name'\n   value='`$tmp.vnf-name`' />\n","comments":"","x":510.1190643310547,"y":2463.2620306015015,"z":"be5d0074.91504","wires":[]},{"id":"9393d0c7.d77e9","type":"save","name":"update generic-vnf","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"vnf-name\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name`\" />\n<parameter name=\"prov-status\" value=\"PREPROV\" />\n<!-- <parameter name=\"operational-status\" value=\"out-of-service-path\" /> -->\n<parameter name=\"equipment-role\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role`\" />\n<parameter name=\"model-invariant-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid`\" />\n<parameter name=\"model-version-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid`\" />\n<parameter name=\"model-customization-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid`\" />\n<parameter name=\"in-maint\" value=\"true\" />\n<parameter name=\"selflink\" value=\"`$vnf-object-path`\" />\n","comments":"","outputs":1,"x":436.2858428955078,"y":5442.309047698975,"z":"be5d0074.91504","wires":[["d9c5980e.eb83a8","480590e1.d0ad9"]]},{"id":"e6df8bdc.9062b8","type":"set","name":"set vnf-object-path","xml":"<set>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n","comments":"","x":436.28588104248047,"y":5372.309530258179,"z":"be5d0074.91504","wires":[]},{"id":"9dcdbace.684eb8","type":"set","name":"set vnf-id","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n","comments":"","x":498.45240783691406,"y":2414.9285736083984,"z":"be5d0074.91504","wires":[]},{"id":"fc6ad87e.cad2c8","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnf.log' />\n","comments":"","outputs":1,"x":410.6192741394043,"y":5702.785669326782,"z":"be5d0074.91504","wires":[[]]},{"id":"ec08bcec.3b30e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n","comments":"","x":1472.9526863098145,"y":5308.975944519043,"z":"be5d0074.91504","wires":[]},{"id":"bf1f1d79.7018b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1172.309886932373,"y":5265.928605079651,"z":"be5d0074.91504","wires":[["27d38884.173358"]]},{"id":"1454f72a.725d29","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1180.8813171386719,"y":5310.214318275452,"z":"be5d0074.91504","wires":[["4c454b39.b3b144"]]},{"id":"3e53f9d4.705fb6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n","comments":"","x":1475.6432800292969,"y":5265.738149642944,"z":"be5d0074.91504","wires":[]},{"id":"22f19811.37d758","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n","comments":"","x":907.9526214599609,"y":5462.309480667114,"z":"be5d0074.91504","wires":[]},{"id":"d9c5980e.eb83a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":610.6431732177734,"y":5420.9286432266235,"z":"be5d0074.91504","wires":[["ee34f26f.d315d"]]},{"id":"480590e1.d0ad9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":619.2146034240723,"y":5465.214356422424,"z":"be5d0074.91504","wires":[["8ef6f5ea.1df328"]]},{"id":"4db84c3d.411824","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating selflink in generic-vnf in AAI\" />\n","comments":"","x":910.6432151794434,"y":5419.071685791016,"z":"be5d0074.91504","wires":[]},{"id":"bd2ebb93.969ad8","type":"set","name":"set model-customization-uuid","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n","comments":"","x":561.7857284545898,"y":2866.5951776504517,"z":"be5d0074.91504","wires":[]},{"id":"6f35740b.7867bc","type":"execute","name":"split related-link","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\n   <parameter name='ctx_memory_result_key' value='aai-uid-split' />\n   <parameter name='original_string' value='`$aai.cloud-region.relationship-list.relationship[$idx].related-link`' />\n   <parameter name='regex' value='/' />\n","comments":"","outputs":1,"x":1327.119026184082,"y":2988.008761405945,"z":"be5d0074.91504","wires":[[]]},{"id":"8ea9283d.520568","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1146.7857284545898,"y":3034.675549507141,"z":"be5d0074.91504","wires":[["6f35740b.7867bc","58064897.8348d8","7b986ac4.ee9cc4"]]},{"id":"7b986ac4.ee9cc4","type":"break","name":"break","xml":"<break>\n","comments":"","x":1296.7856903076172,"y":3078.008846282959,"z":"be5d0074.91504","wires":[]},{"id":"55cdaf47.06229","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":747.9525146484375,"y":5143.723401069641,"z":"be5d0074.91504","wires":[["61de414e.afb53","51a8f712.305ee8"]]},{"id":"51a8f712.305ee8","type":"save","name":"save generic-vnf availability-zone relationship","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"availability-zone\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.cloud-region.cloud-owner`\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"availability-zone.availability-zone-name\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`\" />\n","comments":"","outputs":1,"x":1041.285903930664,"y":5167.056855201721,"z":"be5d0074.91504","wires":[["711bb404.976d3c","66bf2c91.3ad974"]]},{"id":"c18c0d8e.e9c0f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n","comments":"","x":1598.428565979004,"y":5190.976183891296,"z":"be5d0074.91504","wires":[]},{"id":"711bb404.976d3c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1306.119155883789,"y":5147.928677558899,"z":"be5d0074.91504","wires":[["eb26162.58114e8"]]},{"id":"66bf2c91.3ad974","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1314.690586090088,"y":5192.2143907547,"z":"be5d0074.91504","wires":[["7ab0197d.e139d8"]]},{"id":"978ac8bf.3e8f28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n","comments":"","x":1601.1191596984863,"y":5147.738389015198,"z":"be5d0074.91504","wires":[]},{"id":"31b1e600.94057a","type":"set","name":"set mapping rows to 0","xml":"<set>\n<parameter name='db.vf-network-role-mapping_length' value='0' />\n","comments":"","x":1120.595199584961,"y":3280.866147994995,"z":"be5d0074.91504","wires":[]},{"id":"9523ee9.421ab1","type":"switchNode","name":"switch AAI availability-zone_length","xml":"<switch test='`$aai.cloud-region.availability-zones.availability-zone_length`'>\n","comments":"","outputs":1,"x":488.6668014526367,"y":5047.5329875946045,"z":"be5d0074.91504","wires":[["4ac5d11f.7a4fa"]]},{"id":"4ac5d11f.7a4fa","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":707.2382202148438,"y":5047.104396820068,"z":"be5d0074.91504","wires":[["f3cad836.ee2ae8"]]},{"id":"d6a1b0e1.9042e","type":"set","name":"set availability-zone_length to 0","xml":"<set>\n<parameter name='aai.cloud-region.availability-zones.availability-zone_length' value='0' />\n","comments":"","x":1308.666862487793,"y":5065.675634384155,"z":"be5d0074.91504","wires":[]},{"id":"f3cad836.ee2ae8","type":"switchNode","name":"switch AZ max count > 0","xml":"<switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>\n","comments":"","outputs":1,"x":895.8096923828125,"y":5047.532708644867,"z":"be5d0074.91504","wires":[["fb65358a.19e9b8","d1646588.cb4098"]]},{"id":"fb65358a.19e9b8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1098.666799545288,"y":5021.818458557129,"z":"be5d0074.91504","wires":[["d5bf8b09.cbb7e8"]]},{"id":"d1646588.cb4098","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1100.0954208374023,"y":5066.104206085205,"z":"be5d0074.91504","wires":[["d6a1b0e1.9042e"]]},{"id":"d7cc47f9.e02768","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No availability zones found in AAI for cloud region '\n       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n","comments":"","x":1390.0953063964844,"y":5019.866150856018,"z":"be5d0074.91504","wires":[]},{"id":"f2cc54c5.7493c8","type":"execute","name":"execute PropertiesNode","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":508.57144927978516,"y":188.60415267944336,"z":"be5d0074.91504","wires":[[]]},{"id":"5709eb79.187104","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":726.9047546386719,"y":1864.6755771636963,"z":"be5d0074.91504","wires":[["d20f8c4c.aaaef"]]},{"id":"6bde2612.3dd418","type":"switchNode","name":"switch ecomp-naming","xml":"<switch test='`$db.vf-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1104.5241432189941,"y":1765.3900136947632,"z":"be5d0074.91504","wires":[["8d3476a9.1746b8","4f89d2ab.d33efc","e9979aef.402b38"]]},{"id":"d20f8c4c.aaaef","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":872.619255065918,"y":1864.6756944656372,"z":"be5d0074.91504","wires":[["6bde2612.3dd418","fc9752c8.f26a8"]]},{"id":"4f89d2ab.d33efc","type":"outcome","name":"N","xml":"<outcome value='N'>","comments":"","outputs":1,"x":1290.9525299072266,"y":1765.8661403656006,"z":"be5d0074.91504","wires":[["2d0f9daa.bc4892"]]},{"id":"2d0f9daa.bc4892","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"No vnf-name was received but ecomp-generated-naming is not Y\" />\n","comments":"","x":1445.2383155822754,"y":1784.4375848770142,"z":"be5d0074.91504","wires":[]},{"id":"8d3476a9.1746b8","type":"outcome","name":"Y","xml":"<outcome value='Y'>","comments":"","outputs":1,"x":1290.952522277832,"y":1724.4375944137573,"z":"be5d0074.91504","wires":[["bdd18d45.8079f"]]},{"id":"e9979aef.402b38","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1290.9524688720703,"y":1808.7232723236084,"z":"be5d0074.91504","wires":[["2d0f9daa.bc4892"]]},{"id":"bdd18d45.8079f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1428.0954399108887,"y":1724.5804615020752,"z":"be5d0074.91504","wires":[[]]},{"id":"cfdd3602.799058","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":712.0954818725586,"y":2219.294753074646,"z":"be5d0074.91504","wires":[["7f164ae2.280aa4"]]},{"id":"7f164ae2.280aa4","type":"set","name":"set tmp.vnf-name","xml":"<set>\n<parameter name='tmp.vnf-name' value=\"`$vnf-topology-operation-input.vnf-information.vnf-name`\" />\n","comments":"","x":877.8574447631836,"y":2218.1520233154297,"z":"be5d0074.91504","wires":[]},{"id":"ccce63ca.12c4d","type":"call","name":"call GENERIC-RESOURCE-API:generate-unique-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n","comments":"","outputs":1,"x":1762.9287223815918,"y":1914.4375138282776,"z":"be5d0074.91504","wires":[["572f952.2f8446c","b26bb6ea.82f758"]]},{"id":"572f952.2f8446c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2040.0715255737305,"y":1888.0090470314026,"z":"be5d0074.91504","wires":[["aefe1dbf.ad7fc"]]},{"id":"b26bb6ea.82f758","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2044.8332710266113,"y":1933.3899579048157,"z":"be5d0074.91504","wires":[["4e0d04fb.4ffd4c"]]},{"id":"809d618b.3699e","type":"set","name":"set variables for generating unique name","xml":"<set>\n<parameter name='generate-unique-name-input.action' value='ASSIGN' />\n<parameter name='generate-unique-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='generate-unique-name-input.index-table-name' value='VNF_NAME_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vnf_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNF_INSTANCE' />\n<parameter name='generate-unique-name-input.prefix' value=\"`'z' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + $db.vf-model.nf-code`\" />\n","comments":"","x":1717.9289741516113,"y":1865.5328335762024,"z":"be5d0074.91504","wires":[]},{"id":"4e0d04fb.4ffd4c","type":"set","name":"set tmp.vnf-name to generated name","xml":"<set>\n<parameter name='tmp.vnf-name' value='`$generate-unique-name-output.generated-name`' />\n","comments":"","x":2267.7376670837402,"y":1932.86603307724,"z":"be5d0074.91504","wires":[]},{"id":"aefe1dbf.ad7fc","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=\"`$generate-unique-name-output.error-message`\" />\n","comments":"","x":2193.6429862976074,"y":1887.4375567436218,"z":"be5d0074.91504","wires":[]},{"id":"fc9752c8.f26a8","type":"switchNode","name":"switch naming-policy","xml":"<switch test='`$db.vf-model.naming-policy`'>\n","comments":"","outputs":1,"x":1102.309726715088,"y":1973.675630569458,"z":"be5d0074.91504","wires":[["e81046cf.e30718","c33ad7a8.9551f8"]]},{"id":"e81046cf.e30718","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1292.309658050537,"y":1895.1041851043701,"z":"be5d0074.91504","wires":[["e908e3dd.17c76"]]},{"id":"c33ad7a8.9551f8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1292.5478973388672,"y":2022.4851293563843,"z":"be5d0074.91504","wires":[["17eeb246.7b4dee"]]},{"id":"e908e3dd.17c76","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1445.1669273376465,"y":1893.675651550293,"z":"be5d0074.91504","wires":[["809d618b.3699e","ccce63ca.12c4d"]]},{"id":"5f34736e.da87ac","type":"call","name":"call GENERIC-RESOURCE-API:naming-policy-generate-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n","comments":"","outputs":1,"x":1784.2148513793945,"y":2038.199511051178,"z":"be5d0074.91504","wires":[["d4615f91.93833","aa0d10c0.0ed26"]]},{"id":"17eeb246.7b4dee","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1447.0717468261719,"y":2022.4851293563843,"z":"be5d0074.91504","wires":[["2b7b29b.07127d6","5f34736e.da87ac"]]},{"id":"2b7b29b.07127d6","type":"set","name":"set variables for generating name","xml":"<set>\n<parameter name='naming-policy-generate-name-input.policy-instance-name' value='`$db.vf-model.naming-policy`' />\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='ASSIGN' />\n<parameter name='naming-policy-generate-name-input.query-parameter' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />","comments":"","x":1694.2147674560547,"y":1992.4851651191711,"z":"be5d0074.91504","wires":[]},{"id":"4a5f4740.237338","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=\"Unable to generate VNF name\" />\n","comments":"","x":2227.0718002319336,"y":2012.0564489364624,"z":"be5d0074.91504","wires":[]},{"id":"26710442.f40cdc","type":"set","name":"set tmp.vnf-name to generated name","xml":"<set>\n<parameter name='tmp.vnf-name' value='`$naming-policy-generate-name-output.vnf-name`' />\n","comments":"","x":2305.5003700256348,"y":2056.7707509994507,"z":"be5d0074.91504","wires":[]},{"id":"eb91c268.10c28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1988.571159362793,"y":2838.841775894165,"z":"be5d0074.91504","wires":[["ff28928b.062b3","a2fb2a44.e25608"]]},{"id":"a2fb2a44.e25608","type":"call","name":"call GENERIC-RESOURCE-API:naming-policy-generate-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n","comments":"","outputs":1,"x":2312.856864929199,"y":2865.4133071899414,"z":"be5d0074.91504","wires":[[]]},{"id":"ff28928b.062b3","type":"set","name":"set variables for deleting name","xml":"<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n","comments":"","x":2214.285484313965,"y":2818.270378112793,"z":"be5d0074.91504","wires":[]},{"id":"a10bd767.ea4798","type":"comment","name":"Unassign the VNF name","info":"","comments":"","x":2080.237808227539,"y":2758.841877937317,"z":"be5d0074.91504","wires":[]},{"id":"8730c02a.4d9e7","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":928.5714950561523,"y":2923.8420758247375,"z":"be5d0074.91504","wires":[["7181fd4f.3b9314","eb91c268.10c28"]]},{"id":"76478117.63a79","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":926.9047775268555,"y":2965.508828163147,"z":"be5d0074.91504","wires":[["fd97eb04.7d1378","eb91c268.10c28"]]},{"id":"b5eeb045.601e6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":783.5714492797852,"y":3147.1754579544067,"z":"be5d0074.91504","wires":[["c1a2c00.3db054","eb91c268.10c28"]]},{"id":"6e98f691.cd8c98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1075.238136291504,"y":3237.1754579544067,"z":"be5d0074.91504","wires":[["7d5b4659.62fc88","eb91c268.10c28"]]},{"id":"15b5633e.00b0bd","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1635.2381553649902,"y":3391.1753253936768,"z":"be5d0074.91504","wires":[["24c9dca7.afc914","eb91c268.10c28"]]},{"id":"fac96d9.7296c9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1633.5714378356934,"y":3432.842077732086,"z":"be5d0074.91504","wires":[["bf85b613.22da88","eb91c268.10c28"]]},{"id":"f42827cf.7bebd8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1576.9047813415527,"y":3848.8420734405518,"z":"be5d0074.91504","wires":[["bd21a4ce.761328","eb91c268.10c28"]]},{"id":"d5bf8b09.cbb7e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1233.9048233032227,"y":5020.508767127991,"z":"be5d0074.91504","wires":[["d7cc47f9.e02768","eb91c268.10c28"]]},{"id":"eb26162.58114e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1453.9048233032227,"y":5148.508767127991,"z":"be5d0074.91504","wires":[["978ac8bf.3e8f28","eb91c268.10c28"]]},{"id":"7ab0197d.e139d8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1452.2381057739258,"y":5192.1755194664,"z":"be5d0074.91504","wires":[["c18c0d8e.e9c0f","eb91c268.10c28"]]},{"id":"27d38884.173358","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1317.2381973266602,"y":5265.508767127991,"z":"be5d0074.91504","wires":[["3e53f9d4.705fb6","eb91c268.10c28"]]},{"id":"4c454b39.b3b144","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1315.5714797973633,"y":5309.1755194664,"z":"be5d0074.91504","wires":[["ec08bcec.3b30e","eb91c268.10c28"]]},{"id":"ee34f26f.d315d","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":763.904857635498,"y":5420.508882522583,"z":"be5d0074.91504","wires":[["4db84c3d.411824","eb91c268.10c28"]]},{"id":"8ef6f5ea.1df328","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":762.2381401062012,"y":5464.175634860992,"z":"be5d0074.91504","wires":[["22f19811.37d758","eb91c268.10c28"]]},{"id":"d4615f91.93833","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2082.3808975219727,"y":2013.1280183792114,"z":"be5d0074.91504","wires":[["4a5f4740.237338"]]},{"id":"aa0d10c0.0ed26","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2087.1426429748535,"y":2058.5089292526245,"z":"be5d0074.91504","wires":[["26710442.f40cdc"]]},{"id":"7b71c44b.6d928c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":737.6189956665039,"y":1368.0952367782593,"z":"be5d0074.91504","wires":[["692dc4cc.06594c","ad3abca7.574a4"]]},{"id":"59afdec8.0d6fc","type":"for","name":"for each instance group id","xml":"<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >\n","comments":"","outputs":1,"x":520.9523429870605,"y":1368.761881828308,"z":"be5d0074.91504","wires":[["7b71c44b.6d928c"]]},{"id":"692dc4cc.06594c","type":"get-resource","name":"get-resource instance-group","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"instance-group\" \n\t\tkey=\"instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\"\n        pfx='aai.instance-group' local-only='false' >\n\n","comments":"","outputs":1,"x":968.9523544311523,"y":1291.4286184310913,"z":"be5d0074.91504","wires":[["44a92d04.daaea4","2937e52b.43293a"]]},{"id":"2937e52b.43293a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1183.1985626220703,"y":1309.5794668197632,"z":"be5d0074.91504","wires":[["8fda8fc0.0688e"]]},{"id":"44a92d04.daaea4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1192.1271591186523,"y":1267.8652000427246,"z":"be5d0074.91504","wires":[["35f13cd1.8e7824"]]},{"id":"35f13cd1.8e7824","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=\"`'Cannot find instance group id ' +\n      $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n      + ' in AAI'`\" />\n","comments":"","x":1364.9523696899414,"y":1265.4286108016968,"z":"be5d0074.91504","wires":[]},{"id":"8fda8fc0.0688e","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 retrieving instance-group from AAI\" />\n","comments":"","x":1364.9523696899414,"y":1309.4286108016968,"z":"be5d0074.91504","wires":[]},{"id":"ad3abca7.574a4","type":"for","name":"for each relationship","xml":"<for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":942.619010925293,"y":1439.7619342803955,"z":"be5d0074.91504","wires":[["12d4f1e6.ff3a3e"]]},{"id":"12d4f1e6.ff3a3e","type":"switchNode","name":"switch related-to","xml":"<switch test='`$aai.instance-group.relationship-list.relationship[$rel-index].related-to`'>\n","comments":"","outputs":1,"x":1155.9524536132812,"y":1439.7618732452393,"z":"be5d0074.91504","wires":[["71a5792c.8ec168"]]},{"id":"71a5792c.8ec168","type":"outcome","name":"collection","xml":"<outcome value='collection'>\n","comments":"","outputs":1,"x":1327.6190910339355,"y":1439.7619552612305,"z":"be5d0074.91504","wires":[["e8dfecae.87983"]]},{"id":"e8dfecae.87983","type":"get-resource","name":"get-resource collection","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"collection\" \n\t\tkey=\"collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n        pfx='aai.collection' local-only='false' >\n\n","comments":"","outputs":1,"x":1547.618995666504,"y":1438.0952167510986,"z":"be5d0074.91504","wires":[["7605232d.b437ec","c8628f19.c65e4","e8719477.a58328"]]},{"id":"c8628f19.c65e4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1761.8651885986328,"y":1389.579405784607,"z":"be5d0074.91504","wires":[["9f1118db.4a84c8"]]},{"id":"7605232d.b437ec","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1770.7937850952148,"y":1347.8651390075684,"z":"be5d0074.91504","wires":[["7bca285f.557c98"]]},{"id":"7bca285f.557c98","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=\"`'Cannot find collection ' +\n      $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\n      + ' in AAI'`\" />\n","comments":"","x":1927.618995666504,"y":1346.4286108016968,"z":"be5d0074.91504","wires":[]},{"id":"9f1118db.4a84c8","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=\"System error retrieving collection from AAI\" />\n","comments":"","x":1927.618995666504,"y":1390.4286108016968,"z":"be5d0074.91504","wires":[]},{"id":"e8719477.a58328","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1760.9523963928223,"y":1526.4285821914673,"z":"be5d0074.91504","wires":[["6f40d450.f9ee5c"]]},{"id":"6f40d450.f9ee5c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1914.2855377197266,"y":1525.7618780136108,"z":"be5d0074.91504","wires":[["edf05ef0.1dd5e","b0242e5b.93cc7","87b9eedb.3dc8d","42a9ebf.50fbd14","8b30506e.9482a"]]},{"id":"edf05ef0.1dd5e","type":"for","name":"for each network-instance-group","xml":"<for silentFailure='true' index='nig-index' start='0' end='`$service-data.network-instance-groups.network-instance-group_length`' >\n","comments":"","outputs":1,"x":2152.618881225586,"y":1476.4286260604858,"z":"be5d0074.91504","wires":[["9e5b6c89.d1809"]]},{"id":"b0242e5b.93cc7","type":"set","name":"set found-network-instance-group to false","xml":"<set>\n<parameter name='found-network-instance-group' value='false' />\n","comments":"","x":2182.6188430786133,"y":1429.7619981765747,"z":"be5d0074.91504","wires":[]},{"id":"9e5b6c89.d1809","type":"switchNode","name":"network-instance-group-id matches?","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n  == $service-data.network-instance-groups.network-instance-group[$nig-index].network-instance-group-id`'>\n","comments":"","outputs":1,"x":2469.2853927612305,"y":1476.4286251068115,"z":"be5d0074.91504","wires":[["abc51c7b.c7ef5"]]},{"id":"abc51c7b.c7ef5","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2690.9521713256836,"y":1476.4285898208618,"z":"be5d0074.91504","wires":[["1dbe3fe2.e99a9"]]},{"id":"1dbe3fe2.e99a9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2820.9522018432617,"y":1476.4286661148071,"z":"be5d0074.91504","wires":[["3e368576.b8d45a","5c2a9090.033f1"]]},{"id":"3e368576.b8d45a","type":"set","name":"set found-network-instance-group to true","xml":"<set>\n<parameter name='found-network-instance-group' value='true' />\n","comments":"","x":3054.2853775024414,"y":1448.0952911376953,"z":"be5d0074.91504","wires":[]},{"id":"5c2a9090.033f1","type":"break","name":"break","xml":"<break>\n","comments":"","x":2947.6189918518066,"y":1496.4286613464355,"z":"be5d0074.91504","wires":[]},{"id":"87b9eedb.3dc8d","type":"switchNode","name":"switch found-network-instance-group","xml":"<switch test='`$found-network-instance-group`'>\n","comments":"","outputs":1,"x":2164.285499572754,"y":1526.4286069869995,"z":"be5d0074.91504","wires":[["aafceefd.beca3"]]},{"id":"aafceefd.beca3","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2385.952346801758,"y":1526.428629398346,"z":"be5d0074.91504","wires":[["84852ec8.853e3"]]},{"id":"84852ec8.853e3","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=\"`'Could not find network instance group ' +\n      $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n      + ' in MD-SAL'`\" />\n","comments":"","x":2532.6189193725586,"y":1524.7619638442993,"z":"be5d0074.91504","wires":[]},{"id":"2c4a61bc.2ff89e","type":"set","name":"set tmp.vnf-network-collection_length to 0","xml":"<set>\n<parameter name='tmp.vnf-network-collection_length' value='0' />\n","comments":"","x":569.2856826782227,"y":1319.7620134353638,"z":"be5d0074.91504","wires":[]},{"id":"42a9ebf.50fbd14","type":"set","name":"set vnf-network-collection data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-instance-group-function'\n  value='`$aai.instance-group.instance-group-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-instance-group-id'\n  value='`$aai.instance-group.id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-collection-service-instance-id'\n  value='`$service-data.network-instance-groups.network-instance-group[$nig-index].service-instance-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-collection-customization-uuid'\n  value='`$aai.collection.collection-customization-id`' />\n","comments":"","x":2144.2858238220215,"y":1574.7619428634644,"z":"be5d0074.91504","wires":[]},{"id":"8b30506e.9482a","type":"set","name":"increment tmp.vnf-network-collection_length","xml":"<set>\n<parameter name='tmp.vnf-network-collection_length' value='`$tmp.vnf-network-collection_length + 1`' />\n","comments":"","x":2185.9525299072266,"y":1621.4286108016968,"z":"be5d0074.91504","wires":[]},{"id":"58eda9a2.3858f8","type":"set","name":"set vnf-network-collection_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection_length'\n  value='`$tmp.vnf-network-collection_length`' />\n","comments":"","x":548.4523773193359,"y":1577.261962890625,"z":"be5d0074.91504","wires":[]},{"id":"c7bb3006.7fea2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":672.952465057373,"y":5536.904908180237,"z":"be5d0074.91504","wires":[["88fe44bc.b20cb8"]]},{"id":"e984610a.8e6fd","type":"for","name":"for each instance group id","xml":"<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >\n","comments":"","outputs":1,"x":456.2858123779297,"y":5537.571553230286,"z":"be5d0074.91504","wires":[["c7bb3006.7fea2"]]},{"id":"88fe44bc.b20cb8","type":"save","name":"save generic-vnf relationship to instance-group","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-information.vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"instance-group\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/instance-groups/instance-group/'\n        + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`\" />\n","comments":"","outputs":1,"x":956.2857933044434,"y":5536.4285888671875,"z":"be5d0074.91504","wires":[["b08af364.cb3cc","c5b433d3.c28c9"]]},{"id":"e848e15d.68a83","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n","comments":"","x":1512.952465057373,"y":5554.761841773987,"z":"be5d0074.91504","wires":[]},{"id":"b08af364.cb3cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1215.6430168151855,"y":5513.381004333496,"z":"be5d0074.91504","wires":[["1e05cc88.527fb3"]]},{"id":"c5b433d3.c28c9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1224.2144470214844,"y":5557.666717529297,"z":"be5d0074.91504","wires":[["af381b33.81f6e8"]]},{"id":"1830abef.3e2ad4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating relationship in generic-vnf in AAI\" />\n","comments":"","x":1515.64306640625,"y":5511.5241050720215,"z":"be5d0074.91504","wires":[]},{"id":"1e05cc88.527fb3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1368.9047012329102,"y":5512.961243629456,"z":"be5d0074.91504","wires":[["1830abef.3e2ad4","eb91c268.10c28"]]},{"id":"af381b33.81f6e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1367.2379837036133,"y":5556.627995967865,"z":"be5d0074.91504","wires":[["e848e15d.68a83","eb91c268.10c28"]]},{"id":"faee63b4.f8527","type":"switchNode","name":"switch subnet_length","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`'>\n","comments":"","outputs":1,"x":1277.8572120666504,"y":3969.523956298828,"z":"be5d0074.91504","wires":[["c04597b.b1aa868","58e8fb8e.ae1534","12f9127e.1a58ce"]]},{"id":"c04597b.b1aa868","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1450.7143745422363,"y":3932.381015777588,"z":"be5d0074.91504","wires":[["4b6d60ec.1203c"]]},{"id":"58e8fb8e.ae1534","type":"outcome","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":1452.1429443359375,"y":3970.952178955078,"z":"be5d0074.91504","wires":[["4b6d60ec.1203c"]]},{"id":"12f9127e.1a58ce","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1450.7144088745117,"y":4009.5235710144043,"z":"be5d0074.91504","wires":[["e69e985e.2e9298"]]},{"id":"e69e985e.2e9298","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1572.1429634094238,"y":4009.523838043213,"z":"be5d0074.91504","wires":[["705a058a.b98a8c","84cd03b2.470d3"]]},{"id":"4b6d60ec.1203c","type":"set","name":"set subnet_length to 0","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\n   value='0' />\n","comments":"","x":1643.5715675354004,"y":3940.952178955078,"z":"be5d0074.91504","wires":[]},{"id":"c662231.39140e","type":"call","name":"call self-serve-vnf-assign","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >\n","comments":"","outputs":1,"x":1138.2576904296875,"y":567.7025542259216,"z":"be5d0074.91504","wires":[["97aac06d.eeb83"]]},{"id":"e2e6067.ebb3cf8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`\" />\n","comments":"","x":1522.3290672302246,"y":567.7025046348572,"z":"be5d0074.91504","wires":[]},{"id":"eff2987e.a77eb8","type":"comment","name":"SELF-SERVE FORK","info":"","comments":"","x":869.1270141601562,"y":590.1548004150391,"z":"be5d0074.91504","wires":[]},{"id":"97aac06d.eeb83","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1343.5552711486816,"y":567.1905856132507,"z":"be5d0074.91504","wires":[["e2e6067.ebb3cf8"]]},{"id":"f09bed97.7d31e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":254.36508178710938,"y":407.04765033721924,"z":"be5d0074.91504","wires":[["f2cc54c5.7493c8","e5ad0d66.70637","95e7dc2c.60081","b07f3957.23cee8","575233c8.305a6c","e450a9d4.f6b6a8"]]},{"id":"26bcf61d.39ed8a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1913.3334197998047,"y":3988.1280336380005,"z":"be5d0074.91504","wires":[["60076dea.ddca64","95a8bc37.de49c","23fb5171.228f8e","b90fa041.aaba2"]]},{"id":"6a145c65.18a254","type":"set","name":"clear aai.l3-network","xml":"<set>\n<parameter name='aai.l3-network.' value='' />\n","comments":"","x":1271.9048652648926,"y":3360.985152244568,"z":"be5d0074.91504","wires":[]},{"id":"dfefb0c6.308d5","type":"break","name":"break","xml":"<break>\n","comments":"","x":3713.6188011169434,"y":3888.127716064453,"z":"be5d0074.91504","wires":[]},{"id":"3d04abe8.1b48a4","type":"set","name":"set found-network to false","xml":"<set>\n<parameter name='found-network' value='false' />\n","comments":"","x":1413.3333930969238,"y":3593.8421201705933,"z":"be5d0074.91504","wires":[]},{"id":"a31baa94.b136c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2385.0476989746094,"y":3748.1279163360596,"z":"be5d0074.91504","wires":[["427d1cc0.bee434","5549edaf.7acea4"]]},{"id":"5549edaf.7acea4","type":"switchNode","name":"switch found-network","xml":"<switch test='`$found-network`'>\n","comments":"","outputs":1,"x":2576.476245880127,"y":3778.1279706954956,"z":"be5d0074.91504","wires":[["36f14756.ae8f48"]]},{"id":"e7b2f268.9efeb","type":"set","name":"set found-network to true","xml":"<set>\n<parameter name='found-network' value='true' />\n","comments":"","x":3769.3336791992188,"y":3842.413396835327,"z":"be5d0074.91504","wires":[]},{"id":"36f14756.ae8f48","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2745.047737121582,"y":3778.127900123596,"z":"be5d0074.91504","wires":[["d5854119.b6b79"]]},{"id":"d5854119.b6b79","type":"break","name":"break","xml":"<break>\n","comments":"","x":2875.047805786133,"y":3776.699294090271,"z":"be5d0074.91504","wires":[]},{"id":"ad1cc61a.69a3c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1585.3334159851074,"y":3721.84219455719,"z":"be5d0074.91504","wires":[["88980c13.6b138","9afc419a.5b34a"]]},{"id":"9afc419a.5b34a","type":"switchNode","name":"switch found-network","xml":"<switch test='`$found-network`'>\n","comments":"","outputs":1,"x":1795.3333702087402,"y":3793.8420782089233,"z":"be5d0074.91504","wires":[["f66a4612.6df9f8"]]},{"id":"f66a4612.6df9f8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1963.9048614501953,"y":3793.842007637024,"z":"be5d0074.91504","wires":[["a1bada83.a833c8"]]},{"id":"a1bada83.a833c8","type":"break","name":"break","xml":"<break>\n","comments":"","x":2093.904930114746,"y":3792.4134016036987,"z":"be5d0074.91504","wires":[]},{"id":"f70af5d8.815968","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":1110.6666259765625,"y":721.8571219444275,"z":"be5d0074.91504","wires":[]},{"id":"cddbc37f.04216","type":"set","name":"set vnf-level-oper-status to PendingCreate","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n","comments":"","x":1192.4800720214844,"y":619.1946024894714,"z":"be5d0074.91504","wires":[]},{"id":"304e9350.13a68c","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n","comments":"","outputs":1,"x":1100.5713539123535,"y":669.6343712806702,"z":"be5d0074.91504","wires":[[]]},{"id":"d789f59.74b7f08","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":889.2378845214844,"y":639.1428298950195,"z":"be5d0074.91504","wires":[["c662231.39140e","cddbc37f.04216","304e9350.13a68c","f70af5d8.815968"]]},{"id":"23fb5171.228f8e","type":"set","name":"set subnet data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].ip-version'\n   value='`$tmp.ip-version`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-id'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].neutron-subnet-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].sdnc-subnet-id'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-role'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-name'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].network-start-address'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].network-start-address`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].gateway-address'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].gateway-address`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].cidr-mask'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].cidr-mask`' />\n","comments":"","x":2067.619186401367,"y":4018.8097801208496,"z":"be5d0074.91504","wires":[]},{"id":"b90fa041.aaba2","type":"switchNode","name":"switch dhcp-enabled","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>\n","comments":"","outputs":1,"x":2082.142967224121,"y":4071.6527338027954,"z":"be5d0074.91504","wires":[["49a34eea.6330e","b5daf2d.33bd71"]]},{"id":"49a34eea.6330e","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2245.000131879534,"y":4050.224091529846,"z":"be5d0074.91504","wires":[["8fc71690.7962d8"]]},{"id":"b5daf2d.33bd71","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2243.571464538574,"y":4095.9385175704956,"z":"be5d0074.91504","wires":[["e2f9a136.49111"]]},{"id":"8fc71690.7962d8","type":"set","name":"set dhcp-enabled to Y","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\n   value='Y' />\n","comments":"","x":2417.8573303222656,"y":4048.7954874038696,"z":"be5d0074.91504","wires":[]},{"id":"e2f9a136.49111","type":"set","name":"set dhcp-enabled to N","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\n   value='N' />\n","comments":"","x":2415.000099182129,"y":4095.9385175704956,"z":"be5d0074.91504","wires":[]},{"id":"60076dea.ddca64","type":"switchNode","name":"switch subnet-role","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>\n","comments":"","outputs":1,"x":2082.6191368103027,"y":3900.700406074524,"z":"be5d0074.91504","wires":[["ed1cfe9d.edd28"]]},{"id":"ed1cfe9d.edd28","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2249.2857398986816,"y":3900.7000579833984,"z":"be5d0074.91504","wires":[["61b607ca.bee948"]]},{"id":"61b607ca.bee948","type":"set","name":"set subnet-role to NONE","xml":"<set>\n<parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />\n","comments":"","x":2430.9525260925293,"y":3900.0337104797363,"z":"be5d0074.91504","wires":[]},{"id":"95a8bc37.de49c","type":"switchNode","name":"switch ip-version","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>\n","comments":"","outputs":1,"x":2077.8574714660645,"y":3965.191512107849,"z":"be5d0074.91504","wires":[["cba78d28.62af2","57793043.471d2"]]},{"id":"cba78d28.62af2","type":"outcome","name":"4","xml":"<outcome value='4'>\n","comments":"","outputs":1,"x":2243.5716133117676,"y":3946.619909286499,"z":"be5d0074.91504","wires":[["dff11ccf.bb16a"]]},{"id":"57793043.471d2","type":"outcome","name":"6","xml":"<outcome value='6'>\n","comments":"","outputs":1,"x":2243.571575164795,"y":3988.048652648926,"z":"be5d0074.91504","wires":[["cc470d.526ff8f"]]},{"id":"dff11ccf.bb16a","type":"set","name":"set tmp.ip-version to ipv4","xml":"<set>\n<parameter name='tmp.ip-version' value='ipv4' />\n","comments":"","x":2430.7143783569336,"y":3945.762836456299,"z":"be5d0074.91504","wires":[]},{"id":"cc470d.526ff8f","type":"set","name":"set tmp.ip-version to ipv6","xml":"<set>\n<parameter name='tmp.ip-version' value='ipv6' />\n","comments":"","x":2429.285930633545,"y":3988.0486545562744,"z":"be5d0074.91504","wires":[]},{"id":"80cab39e.772be","type":"switchNode","name":"switch network-role","xml":"<switch test='`$db.vf-network-role-mapping[$role-index].network-role`'>\n","comments":"","outputs":1,"x":710.2856636047363,"y":3973.428563117981,"z":"be5d0074.91504","wires":[["4a80611b.96ec4","62ed6f4a.81897","5ab52110.3fbcd","b4fbca0e.70bc98"]]},{"id":"4a80611b.96ec4","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":878.3809280395508,"y":3871.761974334717,"z":"be5d0074.91504","wires":[["2b279fb6.0c5b6"]]},{"id":"62ed6f4a.81897","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":876.9523048400879,"y":4000.0951623916626,"z":"be5d0074.91504","wires":[["7eca1a93.00ad54"]]},{"id":"2b279fb6.0c5b6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1015.7619361877441,"y":3911.5235538482666,"z":"be5d0074.91504","wires":[[]]},{"id":"dece7ac8.98c8e8","type":"get-resource","name":"get-resource VNF_RELATED_NETWORK_ROLE","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VNF_RELATED_NETWORK_ROLE where vnf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid\n    and network_role = $db.vf-network-role-mapping[$role-index].network-role'\n  pfx='db.vnf-related-network-role[]'>\n\n","comments":"","outputs":1,"x":1372.285758972168,"y":4303.1750774383545,"z":"be5d0074.91504","wires":[["3ab71df.b211ce2","32829263.ca5a0e"]]},{"id":"3ab71df.b211ce2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1640.9524230957031,"y":4133.8419189453125,"z":"be5d0074.91504","wires":[["e67a9905.733058"]]},{"id":"711da561.57e78c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VNF_RELATED_NETWORK_ROLE table\" />\n","comments":"","x":1950.9523963928223,"y":4133.6514892578125,"z":"be5d0074.91504","wires":[]},{"id":"e67a9905.733058","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1788.1429405212402,"y":4132.389933586121,"z":"be5d0074.91504","wires":[["711da561.57e78c","eb91c268.10c28"]]},{"id":"32829263.ca5a0e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1643.9524536132812,"y":4496.508430480957,"z":"be5d0074.91504","wires":[["54f934a8.1407ec"]]},{"id":"54f934a8.1407ec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1810.285758972168,"y":4494.5080852508545,"z":"be5d0074.91504","wires":[["9905f433.bc4c58","b447de2b.f180d","e0e1bfb9.d3392","8e303b97.191248","9bcef03.5e4921","683fecd1.72d594","2a35f71d.88e7e8","70b3b7bf.4dfb18","e3caf961.b0c638"]]},{"id":"6a38ac3.c275454","type":"outcome","name":"service-instance","xml":"<outcome value='service-instance'>\n","comments":"","outputs":1,"x":2748.5712280273438,"y":3666.74675655365,"z":"be5d0074.91504","wires":[["11fe3f3e.4ee511"]]},{"id":"11fe3f3e.4ee511","type":"for","name":"for each relationship data","xml":"<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n","comments":"","outputs":1,"x":2974.0470657348633,"y":3667.175386428833,"z":"be5d0074.91504","wires":[["19207da5.d08342"]]},{"id":"19207da5.d08342","type":"switchNode","name":"switch relationship-key","xml":"<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n","comments":"","outputs":1,"x":3209.2856369018555,"y":3665.5088176727295,"z":"be5d0074.91504","wires":[["941b5311.4c406"]]},{"id":"941b5311.4c406","type":"outcome","name":"service-instance.service-instance-id","xml":"<outcome value='service-instance.service-instance-id'>\n","comments":"","outputs":1,"x":3475.713996887207,"y":3665.5088815689087,"z":"be5d0074.91504","wires":[["4202ddb6.ac36f4"]]},{"id":"4202ddb6.ac36f4","type":"set","name":"set network-service-instance-id","xml":"<set>\n<parameter name='network-service-instance-id'\n  value='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value`' />\n","comments":"","x":3769.2857818603516,"y":3663.842296600342,"z":"be5d0074.91504","wires":[]},{"id":"9905f433.bc4c58","type":"execute","name":"generate network-topology-identifier-structure url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.network-topology-identifier-structure`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.part\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$network-service-instance-id`\"/>\n","comments":"","outputs":1,"x":2129.618927001953,"y":4190.175718307495,"z":"be5d0074.91504","wires":[[]]},{"id":"e0e1bfb9.d3392","type":"execute","name":"execute RestApiCallNode - get network-topology-identifier-structure","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ntis-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ntis\" />\n\n","comments":"","outputs":1,"x":2186.618721008301,"y":4293.604458808899,"z":"be5d0074.91504","wires":[["e4a73926.d67098"]]},{"id":"b447de2b.f180d","type":"execute","name":"generate network-topology-identifier-structure url (part 2)","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.part`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ntis-url\"/>\n    <parameter name=\"target\" value=\"{network-id}\"/>\n    <parameter name=\"replacement\" value=\"`$l3-network-id`\"/>\n","comments":"","outputs":1,"x":2151.285514831543,"y":4233.5090618133545,"z":"be5d0074.91504","wires":[[]]},{"id":"7a50c9f.bf28538","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnfa.log' />\n","comments":"","outputs":1,"x":456.61913299560547,"y":4140.1750774383545,"z":"be5d0074.91504","wires":[[]]},{"id":"e4a73926.d67098","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2515.7279090881348,"y":4293.354936599731,"z":"be5d0074.91504","wires":[["82516186.8c563"]]},{"id":"2728e692.39911a","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=\"`\n    'Error retrieving network-topology-identifier-structure for service instance '\n    + $network-service-instance-id\n    + ' and network-id '\n    + $l3-network-id`\" />\n","comments":"","x":2820.9522857666016,"y":4303.841425895691,"z":"be5d0074.91504","wires":[]},{"id":"82516186.8c563","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2653.1427993774414,"y":4292.580025672913,"z":"be5d0074.91504","wires":[["2728e692.39911a","eb91c268.10c28"]]},{"id":"8e303b97.191248","type":"set","name":"set is-trunked and segmentation-id in vnf-network","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].is-trunked'\n    value='`$mdsal-ntis.network-topology-identifier-structure.is-trunked`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].segmentation-id'\n    value='`$mdsal-ntis.network-topology-identifier-structure.segmentation-id`' />\n    ","comments":"","x":2129.285743713379,"y":4353.842082977295,"z":"be5d0074.91504","wires":[]},{"id":"683fecd1.72d594","type":"save","name":"custom query: get owning entity","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n      resource=\"custom-query\"\n      key=\"format = 'resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"tmp.AnAI-data.oe\">\n<parameter name=\"start[0]\" value=\"`'nodes/service-instances/service-instance?service-instance-id=' + $network-service-instance-id `\" />\n<parameter name=\"start_length\" value=\"1\" />\n<parameter name=\"query\" value=\"/query/owning-entity-fromService-instance\" /> \n","comments":"","outputs":1,"x":2070.2856369018555,"y":4429.1755657196045,"z":"be5d0074.91504","wires":[["a590bc88.67cc3","f93d7275.280a5"]]},{"id":"a590bc88.67cc3","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2280.5236854553223,"y":4407.841919898987,"z":"be5d0074.91504","wires":[["2c629f1.121d76"]]},{"id":"f93d7275.280a5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2287.6665802001953,"y":4453.5561447143555,"z":"be5d0074.91504","wires":[["94b1d4ef.94ad08"]]},{"id":"f1c34530.cdc708","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 getting owning entity from service instance\" />\n","comments":"","x":2585.2856369018555,"y":4405.8420696258545,"z":"be5d0074.91504","wires":[]},{"id":"2c629f1.121d76","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2422.4761810302734,"y":4404.580513954163,"z":"be5d0074.91504","wires":[["f1c34530.cdc708","eb91c268.10c28"]]},{"id":"34fee23.74b641e","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=\"Unable to find owning entity from service instance\" />\n","comments":"","x":2583.6191329956055,"y":4455.8420696258545,"z":"be5d0074.91504","wires":[]},{"id":"94b1d4ef.94ad08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2420.8096771240234,"y":4454.580513954163,"z":"be5d0074.91504","wires":[["34fee23.74b641e","eb91c268.10c28"]]},{"id":"d9bc3d6f.ee479","type":"save","name":"custom query: get tenant network","xml":"<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n      resource=\"custom-query\"\n      key=\"format = 'resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"tmp.AnAI-data.get-networks\">\n<parameter name=\"start[0]\" value=\"`'/business/owning-entities/owning-entity/' + $tmp.AnAI-data.oe.results[0].owning-entity.owning-entity-id `\" />\n<parameter name=\"start_length\" value=\"1\" />\n<parameter name=\"query\" value=\"`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role\n  + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" /> \n","comments":"","outputs":1,"x":2519.9524536132812,"y":4602.175703048706,"z":"be5d0074.91504","wires":[["8560d674.04df58","387d8908.bfa816"]]},{"id":"8560d674.04df58","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2733.190502166748,"y":4580.8422021865845,"z":"be5d0074.91504","wires":[["2edb259f.d6427a"]]},{"id":"387d8908.bfa816","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2740.333396911621,"y":4626.556427001953,"z":"be5d0074.91504","wires":[["83120bbc.de2f08"]]},{"id":"9b719b4e.2bbdf8","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 calling getNetworks custom query in AAI\" />\n","comments":"","x":3037.9524536132812,"y":4578.842351913452,"z":"be5d0074.91504","wires":[]},{"id":"2edb259f.d6427a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2875.142997741699,"y":4577.58079624176,"z":"be5d0074.91504","wires":[["9b719b4e.2bbdf8","eb91c268.10c28"]]},{"id":"4dfbb550.f5a8cc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No l3-network returned from getNetworks custom query for related network role '\n      + $db.vnf-related-network-role[0].related-network-role`\" />\n","comments":"","x":3036.2859497070312,"y":4628.842351913452,"z":"be5d0074.91504","wires":[]},{"id":"83120bbc.de2f08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2873.476493835449,"y":4627.58079624176,"z":"be5d0074.91504","wires":[["4dfbb550.f5a8cc","eb91c268.10c28"]]},{"id":"154d643c.80192c","type":"for","name":"for each relationship","xml":"<for index='rel-index' start='0' end='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship_length`' >\n","comments":"","outputs":1,"x":2486.9524536132812,"y":4728.175848007202,"z":"be5d0074.91504","wires":[["2356569c.ffc24a"]]},{"id":"2356569c.ffc24a","type":"switchNode","name":"switch related-to","xml":"<switch test='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].related-to`'>\n","comments":"","outputs":1,"x":2684.9524536132812,"y":4728.175848007202,"z":"be5d0074.91504","wires":[["8795e09.89be62"]]},{"id":"8795e09.89be62","type":"outcome","name":"vlan-tag","xml":"<outcome value='vlan-tag'>\n","comments":"","outputs":1,"x":2854.9524536132812,"y":4728.175848007202,"z":"be5d0074.91504","wires":[["346048a1.d0b2d8"]]},{"id":"346048a1.d0b2d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3022.9524536132812,"y":4726.175848007202,"z":"be5d0074.91504","wires":[["17f6fc0d.8dad74","355b66df.e2b0aa","cc38a6f6.b25fe8"]]},{"id":"17f6fc0d.8dad74","type":"set","name":"set vlan-tag-id","xml":"<set>\n<parameter name='vlan-tag-id' value='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value`' />\n","comments":"","x":3198.9524536132812,"y":4686.175848007202,"z":"be5d0074.91504","wires":[]},{"id":"355b66df.e2b0aa","type":"get-resource","name":"get-resource vlan-tag","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"vlan-tag\" \n\t\tkey=\"vlan-tag.vlan-tag-id = $vlan-tag-id\"\n        pfx='aai.vlan-tag' local-only='false'\n>\n","comments":"","outputs":1,"x":3220.9524536132812,"y":4744.175848007202,"z":"be5d0074.91504","wires":[["403307f7.b64c78","e1666ba5.a09638"]]},{"id":"403307f7.b64c78","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3401.0000610351562,"y":4726.318914413452,"z":"be5d0074.91504","wires":[["6ebd4443.1e2c3c"]]},{"id":"6ebd4443.1e2c3c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":3543.809341430664,"y":4726.509556293488,"z":"be5d0074.91504","wires":[["f840cf70.62acd","eb91c268.10c28"]]},{"id":"f840cf70.62acd","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 getting vlan-tag object from AAI\" />\n","comments":"","x":3704.952346801758,"y":4722.176074981689,"z":"be5d0074.91504","wires":[]},{"id":"9bcef03.5e4921","type":"for","name":"for each related network role","xml":"<for index='rel-network-role-index' start='0' end='`$db.vnf-related-network-role_length`' >\n","comments":"","outputs":1,"x":2057.9523849487305,"y":4658.509412765503,"z":"be5d0074.91504","wires":[["9b20a919.5c92d8"]]},{"id":"9b20a919.5c92d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2262.9523849487305,"y":4659.8425579071045,"z":"be5d0074.91504","wires":[["d9bc3d6f.ee479","154d643c.80192c","11b17797.ac7498"]]},{"id":"70b3b7bf.4dfb18","type":"switchNode","name":"switch rn-index","xml":"<switch test='`$rn-index`'>\n","comments":"","outputs":1,"x":2018.9523849487305,"y":4548.1755657196045,"z":"be5d0074.91504","wires":[["91b5c234.d549b"]]},{"id":"2a35f71d.88e7e8","type":"set","name":"set rn-index to related network length","xml":"<set>\n<parameter name='rn-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network_length`' />\n","comments":"","x":2087.6189727783203,"y":4499.17541885376,"z":"be5d0074.91504","wires":[]},{"id":"91b5c234.d549b","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2182.9523849487305,"y":4548.1755657196045,"z":"be5d0074.91504","wires":[["d9d5dae4.bd92c8"]]},{"id":"d9d5dae4.bd92c8","type":"set","name":"set rn-index to 0","xml":"<set>\n<parameter name='rn-index' value='0' />\n","comments":"","x":2342.9523849487305,"y":4548.1755657196045,"z":"be5d0074.91504","wires":[]},{"id":"11b17797.ac7498","type":"set","name":"set related-network data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].network-id'\n  value='`$tmp.AnAI-data.get-networks.results[0].l3-network.network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].network-role'\n  value='`$tmp.AnAI-data.get-networks.results[0].l3-network.network-role`' />\n","comments":"","x":2490.619041442871,"y":4658.842390060425,"z":"be5d0074.91504","wires":[]},{"id":"e3caf961.b0c638","type":"set","name":"set new related network length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network_length'\n  value='`$rn-index + 1`' />\n","comments":"","x":2052.9524536132812,"y":4802.175703048706,"z":"be5d0074.91504","wires":[]},{"id":"e1666ba5.a09638","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3402.9524536132812,"y":4774.175703048706,"z":"be5d0074.91504","wires":[["31d77170.263a3e"]]},{"id":"31d77170.263a3e","type":"set","name":"set related-network data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.vlan-interface'\n  value='`$aai.vlan-tag.vlan-tag-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.upper-tag-id'\n  value='`$aai.vlan-tag.vlan-id-outer`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.lower-tag-id'\n  value='`$aai.vlan-tag.vlan-id-inner`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.is-private'\n  value='`$aai.vlan-tag.is-private`' />\n","comments":"","x":3594.9524536132812,"y":4774.175703048706,"z":"be5d0074.91504","wires":[]},{"id":"cc38a6f6.b25fe8","type":"break","name":"break","xml":"<break>\n","comments":"","x":3172.9524536132812,"y":4812.175703048706,"z":"be5d0074.91504","wires":[]},{"id":"aec7ccd0.894f5","type":"comment","name":"temporary data issue: also ignore string \"null\" and \"NULL\"","info":"","comments":"","x":849.2857666015625,"y":3831.937686920166,"z":"be5d0074.91504","wires":[]},{"id":"5ab52110.3fbcd","type":"outcome","name":"null","xml":"<outcome value='null'>\n","comments":"","outputs":1,"x":876.4285888671875,"y":3914.794828414917,"z":"be5d0074.91504","wires":[["2b279fb6.0c5b6"]]},{"id":"b4fbca0e.70bc98","type":"outcome","name":"NULL","xml":"<outcome value='NULL'>","comments":"","outputs":1,"x":876.4285984039307,"y":3957.651900291443,"z":"be5d0074.91504","wires":[["2b279fb6.0c5b6"]]},{"id":"b07f3957.23cee8","type":"switchNode","name":"switch input cloud-owner","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`'>\n","comments":"","outputs":1,"x":509.28570556640625,"y":243.84222221374512,"z":"be5d0074.91504","wires":[["d3fc9056.4916f","57a81799.8acba8"]]},{"id":"d3fc9056.4916f","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":692.6190795898438,"y":213.84221076965332,"z":"be5d0074.91504","wires":[["9917844.58b4178"]]},{"id":"57a81799.8acba8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":692.3809852600098,"y":254.79470443725586,"z":"be5d0074.91504","wires":[["efdbfc78.53fd6"]]},{"id":"9917844.58b4178","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":827.6190338134766,"y":212.17555046081543,"z":"be5d0074.91504","wires":[[]]},{"id":"efdbfc78.53fd6","type":"set","name":"set prop.cloud-region.cloud-owner","xml":"<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\n","comments":"","x":909.2856903076172,"y":253.84223175048828,"z":"be5d0074.91504","wires":[]},{"id":"575233c8.305a6c","type":"call","name":"call self-serve-vnf-forking-logic","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' >\n","comments":"","outputs":1,"x":527.1428604125977,"y":537.1428661346436,"z":"be5d0074.91504","wires":[[]]},{"id":"e450a9d4.f6b6a8","type":"switchNode","name":"switch ss.self-serve-flag","xml":"<switch test=\"`$ss.self-serve-flag`\">\n","comments":"","outputs":1,"x":507.2855758666992,"y":702.7143535614014,"z":"be5d0074.91504","wires":[["78b4342c.5bbe9c","7b7dd5f.add382c"]]},{"id":"78b4342c.5bbe9c","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":718.9997329711914,"y":775.9996376037598,"z":"be5d0074.91504","wires":[["7362746e.83534c"]]},{"id":"7b7dd5f.add382c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":718.5712509155273,"y":639.5714712142944,"z":"be5d0074.91504","wires":[["d789f59.74b7f08"]]}]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json
deleted file mode 100644
index 72064464..00000000
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-async.json
+++ /dev/null
@@ -1,175 +0,0 @@
-[
-    {
-        "id": "869164d0.22fca8",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 177.77777099609375,
-        "y": 127.96921110153198,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "91e5b207.619a8"
-            ]
-        ]
-    },
-    {
-        "id": "91e5b207.619a8",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 292.0634765625,
-        "y": 168.20732259750366,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "6e27b9bb.02b478"
-            ]
-        ]
-    },
-    {
-        "id": "6e27b9bb.02b478",
-        "type": "method",
-        "name": "method vnf-topology-operation-async",
-        "xml": "<method rpc='vnf-topology-operation-async' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 265.63497161865234,
-        "y": 209.3977770805359,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "67687d15.90d894"
-            ]
-        ]
-    },
-    {
-        "id": "628a912e.96075",
-        "type": "comment",
-        "name": "vnf-topology-operation-async",
-        "info": "",
-        "comments": "",
-        "x": 572.1226272583008,
-        "y": 75.55555486679077,
-        "z": "fafe2484.405f98",
-        "wires": []
-    },
-    {
-        "id": "67687d15.90d894",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 290.3730583190918,
-        "y": 357.0913519859314,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "98b2b32c.4efe9",
-                "ea413579.6ab908",
-                "22dacf93.8c6e4"
-            ]
-        ]
-    },
-    {
-        "id": "98b2b32c.4efe9",
-        "type": "returnSuccess",
-        "name": "return success",
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-        "comments": "",
-        "x": 480.015869140625,
-        "y": 421.5409588813782,
-        "z": "fafe2484.405f98",
-        "wires": []
-    },
-    {
-        "id": "ea413579.6ab908",
-        "type": "switchNode",
-        "name": "switch svc-action",
-        "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 488.63487243652344,
-        "y": 358.15970182418823,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "a26e14a0.c75858",
-                "7d83530e.ba2efc"
-            ]
-        ]
-    },
-    {
-        "id": "a26e14a0.c75858",
-        "type": "outcome",
-        "name": "assign",
-        "xml": "<outcome value='assign'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 684.5872421264648,
-        "y": 335.06455087661743,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "a1897fe3.ec245"
-            ]
-        ]
-    },
-    {
-        "id": "7d83530e.ba2efc",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 681.9205017089844,
-        "y": 379.44537115097046,
-        "z": "fafe2484.405f98",
-        "wires": [
-            [
-                "4fedef3f.f888b"
-            ]
-        ]
-    },
-    {
-        "id": "4fedef3f.f888b",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
-        "comments": "",
-        "x": 833.8252372741699,
-        "y": 379.44545316696167,
-        "z": "fafe2484.405f98",
-        "wires": []
-    },
-    {
-        "id": "22dacf93.8c6e4",
-        "type": "set",
-        "name": "set skip-mdsal-update to Y",
-        "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
-        "comments": "",
-        "x": 518.254020690918,
-        "y": 297.69841051101685,
-        "z": "fafe2484.405f98",
-        "wires": []
-    },
-    {
-        "id": "a1897fe3.ec245",
-        "type": "call",
-        "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 989.2063751220703,
-        "y": 335.1120238304138,
-        "z": "fafe2484.405f98",
-        "wires": [
-            []
-        ]
-    }
-]
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
index dc9de851..46a248f4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "2f80fd18.68d7b2",
+        "id": "f6ad78a6.70d61",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 143,
-        "y": 93.41365623474121,
-        "z": "3a695320.6f0b9c",
+        "x": 147,
+        "y": 72.41365623474121,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "b167e74e.06e8b8"
+                "adefe527.7305b8"
             ]
         ]
     },
     {
-        "id": "b167e74e.06e8b8",
+        "id": "adefe527.7305b8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1170 +22,1134 @@
         "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": 218.28570556640625,
-        "y": 133.6517677307129,
-        "z": "3a695320.6f0b9c",
+        "x": 222.28570556640625,
+        "y": 112.65176773071289,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "51ced5a3.0023bc"
+                "6abc301f.721f8"
             ]
         ]
     },
     {
-        "id": "51ced5a3.0023bc",
+        "id": "6abc301f.721f8",
         "type": "method",
         "name": "method vnf-topology-operation",
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 211.42862701416016,
-        "y": 173.4136505126953,
-        "z": "3a695320.6f0b9c",
+        "x": 215.42862701416016,
+        "y": 152.4136505126953,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "581376ca.27ca98"
+                "d909ae21.d0b"
             ]
         ]
     },
     {
-        "id": "2c7d4d23.7303d2",
+        "id": "33491d1e.01822a",
         "type": "comment",
         "name": "vnf-topology-operation",
         "info": "",
         "comments": "",
-        "x": 537.344856262207,
-        "y": 41,
-        "z": "3a695320.6f0b9c",
+        "x": 541.344856262207,
+        "y": 20,
+        "z": "8e56a38a.ed9008",
         "wires": []
     },
     {
-        "id": "581376ca.27ca98",
+        "id": "d909ae21.d0b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 235.16676330566406,
-        "y": 503.1071767807007,
-        "z": "3a695320.6f0b9c",
+        "x": 231.16676330566406,
+        "y": 339.10718727111816,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "97ab685e.0bee08",
-                "a403694c.693328",
-                "9d92efc8.8d9dd"
+                "12dabaef.e4e31d",
+                "2c72dba1.c09994",
+                "8732851b.070f78"
             ]
         ]
     },
     {
-        "id": "97ab685e.0bee08",
+        "id": "12dabaef.e4e31d",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 527.6667175292969,
-        "y": 658.2712097167969,
-        "z": "3a695320.6f0b9c",
+        "x": 523.6667175292969,
+        "y": 489.27122020721436,
+        "z": "8e56a38a.ed9008",
         "wires": []
     },
     {
-        "id": "a403694c.693328",
+        "id": "2c72dba1.c09994",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 530.5714340209961,
-        "y": 501.31842041015625,
-        "z": "3a695320.6f0b9c",
+        "x": 526.5714340209961,
+        "y": 337.31843090057373,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "18cb9c11.4e7cc4",
-                "1d09f34f.3f578d",
-                "c78cd2e8.79be5",
-                "aa7e294c.376318",
-                "a97cbafe.7cac98",
-                "dbf64216.490f5",
-                "1d72c7ae.622688"
+                "430fcd00.a5d5fc",
+                "c670772c.dd0908",
+                "f99a71f9.aa21e",
+                "681c5b5.a0f9c24",
+                "f1c88e8c.45c93",
+                "587f0736.94e46",
+                "b1dd52ed.b68c7"
             ]
         ]
     },
     {
-        "id": "18cb9c11.4e7cc4",
+        "id": "430fcd00.a5d5fc",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 865.3809814453125,
-        "y": 328.9375305175781,
-        "z": "3a695320.6f0b9c",
+        "x": 938.3809661865234,
+        "y": 47.937567710876465,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "a2f63855.285858"
+                "f8a7b2b3.28c41"
             ]
         ]
     },
     {
-        "id": "1d09f34f.3f578d",
+        "id": "c670772c.dd0908",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 941.4287996292114,
-        "y": 1098.12828540802,
-        "z": "3a695320.6f0b9c",
+        "x": 1009.4287919998169,
+        "y": 733.1283273696899,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "cfcc432b.30488"
+                "b332e291.fef1f"
             ]
         ]
     },
     {
-        "id": "aa7e294c.376318",
+        "id": "681c5b5.a0f9c24",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 925.1430358886719,
-        "y": 1786.318512916565,
-        "z": "3a695320.6f0b9c",
+        "x": 993.1430282592773,
+        "y": 1421.3185548782349,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "199e650e.3f3fbb"
+                "a8606faf.22f988"
             ]
         ]
     },
     {
-        "id": "199e650e.3f3fbb",
+        "id": "a8606faf.22f988",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 1158.3334655761719,
-        "y": 1786.3185739517212,
-        "z": "3a695320.6f0b9c",
+        "x": 1226.3334579467773,
+        "y": 1421.318615913391,
+        "z": "8e56a38a.ed9008",
         "wires": []
     },
     {
-        "id": "9d92efc8.8d9dd",
+        "id": "8732851b.070f78",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 636.4166870117188,
-        "y": 253.79470825195312,
-        "z": "3a695320.6f0b9c",
+        "x": 632.4166870117188,
+        "y": 228.79471588134766,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "b843ebb5.2815d8",
+        "id": "f8a7b2b3.28c41",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1280.5238189697266,
+        "y": 47.50902843475342,
+        "z": "8e56a38a.ed9008",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d3c38eb4.34463",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1747.857307434082,
-        "y": 1051.8423652648926,
-        "z": "3a695320.6f0b9c",
+        "x": 1815.8572998046875,
+        "y": 686.8424072265625,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "cfcc432b.30488",
+        "id": "b332e291.fef1f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1305.5239305496216,
-        "y": 1102.842366218567,
-        "z": "3a695320.6f0b9c",
+        "x": 1373.523922920227,
+        "y": 737.8424081802368,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "c78cd2e8.79be5",
+        "id": "f99a71f9.aa21e",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 910.5238800048828,
-        "y": 837.5089950561523,
-        "z": "3a695320.6f0b9c",
+        "x": 978.5238723754883,
+        "y": 472.50903701782227,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "cbf00737.e7a518"
+                "3c2ff88a.035fd"
             ]
         ]
     },
     {
-        "id": "f274bd69.d26a1",
+        "id": "ef6e2999.a3799",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1704.666877746582,
-        "y": 711.4136543273926,
-        "z": "3a695320.6f0b9c",
+        "x": 1772.6668701171875,
+        "y": 346.4136962890625,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "a97cbafe.7cac98",
+        "id": "f1c88e8c.45c93",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 873.3333129882812,
-        "y": 499.0802936553955,
-        "z": "3a695320.6f0b9c",
+        "x": 941.3333053588867,
+        "y": 139.08033561706543,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "c898ef62.8e1d2"
+                "ca254b38.0ec08"
             ]
         ]
     },
     {
-        "id": "dbf64216.490f5",
+        "id": "587f0736.94e46",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 943.0002298355103,
-        "y": 1230.4999523162842,
-        "z": "3a695320.6f0b9c",
+        "x": 1011.0002222061157,
+        "y": 865.4999942779541,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "c0072f79.b63d9"
+                "1b68499b.7f9d96"
             ]
         ]
     },
     {
-        "id": "1d72c7ae.622688",
+        "id": "b1dd52ed.b68c7",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 936.0002288818359,
-        "y": 1541.4999623298645,
-        "z": "3a695320.6f0b9c",
+        "x": 1004.0002212524414,
+        "y": 1176.5000042915344,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "19fd4172.e8d1ef"
+                "11ce6933.d00f9f"
             ]
         ]
     },
     {
-        "id": "242eeec0.003092",
+        "id": "7de5042a.89ed54",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1115.0000839233398,
-        "y": 554.4999704360962,
-        "z": "3a695320.6f0b9c",
+        "x": 1183.0000762939453,
+        "y": 189.5000123977661,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "3a25fdb7.746092",
-                "40847b80.d6efa4",
-                "eea8d1d0.4bdc3",
-                "6d89db39.aedb84",
-                "eaaed7a1.f78188",
-                "bbf1b1a0.c8198"
+                "dfd6a1d.27647e",
+                "5f50adc7.ac53cc",
+                "31e74903.9d10b6",
+                "d56faee8.37ff78",
+                "cf5adeee.b84288",
+                "946dfa0d.22ede8"
             ]
         ]
     },
     {
-        "id": "40847b80.d6efa4",
+        "id": "5f50adc7.ac53cc",
         "type": "outcome",
         "name": "ActivateSiteInstance",
         "xml": "<outcome value='ActivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1375.4763259887695,
-        "y": 476.97922134399414,
-        "z": "3a695320.6f0b9c",
+        "x": 1443.476318359375,
+        "y": 111.97926330566406,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "10ae7d07.42ded3"
+                "b87f363c.536f48"
             ]
         ]
     },
     {
-        "id": "3a25fdb7.746092",
+        "id": "dfd6a1d.27647e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1348.3811111450195,
-        "y": 712.3572273254395,
-        "z": "3a695320.6f0b9c",
+        "x": 1416.381103515625,
+        "y": 347.3572692871094,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "f274bd69.d26a1"
+                "ef6e2999.a3799"
             ]
         ]
     },
     {
-        "id": "c898ef62.8e1d2",
+        "id": "ca254b38.0ec08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1054.0000839233398,
-        "y": 499.4999704360962,
-        "z": "3a695320.6f0b9c",
+        "x": 1122.0000762939453,
+        "y": 134.5000123977661,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "242eeec0.003092"
+                "7de5042a.89ed54"
             ]
         ]
     },
     {
-        "id": "10ae7d07.42ded3",
+        "id": "b87f363c.536f48",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1742.000129699707,
-        "y": 479.50000381469727,
-        "z": "3a695320.6f0b9c",
+        "x": 1810.0001220703125,
+        "y": 114.50004577636719,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "ada7056f.3de5e8",
+        "id": "e2a5033e.3cfd8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1173.0001983642578,
-        "y": 870.4999618530273,
-        "z": "3a695320.6f0b9c",
+        "x": 1241.0001907348633,
+        "y": 505.50000381469727,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "323f27da.ef8b58",
-                "eed63b9b.32ee88",
-                "7c8e3f2d.ec40e",
-                "1a7d8db.9a66c72",
-                "9378aa69.5e8c68",
-                "1c4e2957.6aa337"
+                "4643a339.a1719c",
+                "47cd0887.0667f8",
+                "65997b7c.169f44",
+                "138fde4d.c3ff5a",
+                "8d371312.adf0b8",
+                "d66cfce5.3961f8"
             ]
         ]
     },
     {
-        "id": "eed63b9b.32ee88",
+        "id": "47cd0887.0667f8",
         "type": "outcome",
         "name": "DeactivateSiteInstance",
         "xml": "<outcome value='DeactivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1416.4763946533203,
-        "y": 821.9792103767395,
-        "z": "3a695320.6f0b9c",
+        "x": 1484.4763870239258,
+        "y": 456.9792523384094,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "3d82b6d7.778aba"
+                "616cb241.dff2f4"
             ]
         ]
     },
     {
-        "id": "323f27da.ef8b58",
+        "id": "4643a339.a1719c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1391.3811111450195,
-        "y": 1052.3572578430176,
-        "z": "3a695320.6f0b9c",
+        "x": 1459.381103515625,
+        "y": 687.3572998046875,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "b843ebb5.2815d8"
+                "d3c38eb4.34463"
             ]
         ]
     },
     {
-        "id": "cbf00737.e7a518",
+        "id": "3c2ff88a.035fd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1112.0001983642578,
-        "y": 815.4999618530273,
-        "z": "3a695320.6f0b9c",
+        "x": 1180.0001907348633,
+        "y": 450.50000381469727,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "ada7056f.3de5e8"
+                "e2a5033e.3cfd8"
             ]
         ]
     },
     {
-        "id": "3d82b6d7.778aba",
+        "id": "616cb241.dff2f4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1786.0001983642578,
-        "y": 819.4999928474426,
-        "z": "3a695320.6f0b9c",
+        "x": 1854.0001907348633,
+        "y": 454.50003480911255,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f0de599.17bcda",
+        "id": "df09f43b.1eb908",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1141.333625793457,
-        "y": 1317.0862617492676,
-        "z": "3a695320.6f0b9c",
+        "x": 1209.3336181640625,
+        "y": 952.0863037109375,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "b2ddc25f.3e0b8",
-                "b407b587.a49908",
-                "8d600b8a.4468d8",
-                "44feac5a.bafec4",
-                "75f7964e.785a28",
-                "265de382.3a352c"
+                "6772d437.231574",
+                "1fe5f5cc.d40db2",
+                "11c2f3bd.05d49c",
+                "2d6c749d.43234c",
+                "48d065a3.28be94",
+                "a2afb217.467ef8"
             ]
         ]
     },
     {
-        "id": "b407b587.a49908",
+        "id": "1fe5f5cc.d40db2",
         "type": "outcome",
         "name": "CreateSiteInstance",
         "xml": "<outcome value='CreateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1396.8101167678833,
-        "y": 1169.5655961036682,
-        "z": "3a695320.6f0b9c",
+        "x": 1464.8101091384888,
+        "y": 804.5656380653381,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "5de7412.21979c"
+                "d80e5dd3.56b4d8"
             ]
         ]
     },
     {
-        "id": "b2ddc25f.3e0b8",
+        "id": "6772d437.231574",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1363.714599609375,
-        "y": 1390.9434814453125,
-        "z": "3a695320.6f0b9c",
+        "x": 1431.7145919799805,
+        "y": 1025.9435234069824,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "6f20c596.7e459c"
+                "eedab70b.41d2f"
             ]
         ]
     },
     {
-        "id": "c0072f79.b63d9",
+        "id": "1b68499b.7f9d96",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1125.3337144851685,
-        "y": 1228.0863199234009,
-        "z": "3a695320.6f0b9c",
+        "x": 1193.333706855774,
+        "y": 863.0863618850708,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "2f0de599.17bcda"
+                "df09f43b.1eb908"
             ]
         ]
     },
     {
-        "id": "5de7412.21979c",
+        "id": "d80e5dd3.56b4d8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1773.333821296692,
-        "y": 1168.0863547325134,
-        "z": "3a695320.6f0b9c",
+        "x": 1841.3338136672974,
+        "y": 803.0863966941833,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f20c596.7e459c",
+        "id": "eedab70b.41d2f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1504.0001754760742,
-        "y": 1391.9999046325684,
-        "z": "3a695320.6f0b9c",
+        "x": 1572.0001678466797,
+        "y": 1026.9999465942383,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a0fb3f8.c9afac",
+        "id": "2c5991d3.fe0726",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.000228881836,
-        "y": 1593.9999623298645,
-        "z": "3a695320.6f0b9c",
+        "x": 1250.0002212524414,
+        "y": 1229.0000042915344,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "901892d5.11367",
-                "a18742c8.67f48",
-                "a17c5490.82e988",
-                "f32a2384.53396",
-                "74bbe07e.451bd",
-                "3b13f0b3.196eb"
+                "93525206.c4868",
+                "b3b4df67.0eb02",
+                "74c68f10.1e24b8",
+                "9f299b09.7aa55",
+                "3ebbe3a2.8b462c",
+                "c94b17f8.0cedb"
             ]
         ]
     },
     {
-        "id": "a18742c8.67f48",
+        "id": "b3b4df67.0eb02",
         "type": "outcome",
         "name": "DeleteSiteInstance",
         "xml": "<outcome value='DeleteSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1422.476448059082,
-        "y": 1539.479206085205,
-        "z": "3a695320.6f0b9c",
+        "x": 1490.4764404296875,
+        "y": 1174.479248046875,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "9c4097de.217dd8"
+                "a249836b.7254f"
             ]
         ]
     },
     {
-        "id": "901892d5.11367",
+        "id": "93525206.c4868",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1387.381233215332,
-        "y": 1789.8574409484863,
-        "z": "3a695320.6f0b9c",
+        "x": 1455.3812255859375,
+        "y": 1424.8574829101562,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "340c5320.cee92c"
+                "2bf5e221.183e6e"
             ]
         ]
     },
     {
-        "id": "19fd4172.e8d1ef",
+        "id": "11ce6933.d00f9f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1121.000228881836,
-        "y": 1538.9999623298645,
-        "z": "3a695320.6f0b9c",
+        "x": 1189.0002212524414,
+        "y": 1174.0000042915344,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "6a0fb3f8.c9afac"
+                "2c5991d3.fe0726"
             ]
         ]
     },
     {
-        "id": "9c4097de.217dd8",
+        "id": "a249836b.7254f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1795.0002517700195,
-        "y": 1536.99995803833,
-        "z": "3a695320.6f0b9c",
+        "x": 1863.000244140625,
+        "y": 1172,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "340c5320.cee92c",
+        "id": "2bf5e221.183e6e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1527.6668090820312,
-        "y": 1790.9138641357422,
-        "z": "3a695320.6f0b9c",
+        "x": 1595.6668014526367,
+        "y": 1425.913906097412,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "eea8d1d0.4bdc3",
+        "id": "31e74903.9d10b6",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1406.6667556762695,
-        "y": 528.0000343322754,
-        "z": "3a695320.6f0b9c",
+        "x": 1474.666748046875,
+        "y": 163.0000762939453,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "fb048089.7fb87"
+                "17588db1.773d92"
             ]
         ]
     },
     {
-        "id": "fb048089.7fb87",
+        "id": "17588db1.773d92",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1846.1904373168945,
-        "y": 526.5207862854004,
-        "z": "3a695320.6f0b9c",
+        "x": 1914.1904296875,
+        "y": 161.5208282470703,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c8e3f2d.ec40e",
+        "id": "65997b7c.169f44",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1457.666633605957,
-        "y": 869.9999890327454,
-        "z": "3a695320.6f0b9c",
+        "x": 1525.6666259765625,
+        "y": 505.0000309944153,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "51051061.26969"
+                "ba2e14f5.6ad49"
             ]
         ]
     },
     {
-        "id": "51051061.26969",
+        "id": "ba2e14f5.6ad49",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1914.190330505371,
-        "y": 869.520824432373,
-        "z": "3a695320.6f0b9c",
+        "x": 1982.1903228759766,
+        "y": 504.52086639404297,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "20880f17.cecd7",
+        "id": "184ea4bf.3b8253",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1843.666633605957,
-        "y": 566.9999732971191,
-        "z": "3a695320.6f0b9c",
+        "x": 1911.6666259765625,
+        "y": 202.00001525878906,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d89db39.aedb84",
+        "id": "d56faee8.37ff78",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1400.142951965332,
-        "y": 574.479190826416,
-        "z": "3a695320.6f0b9c",
+        "x": 1468.1429443359375,
+        "y": 209.47923278808594,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "20880f17.cecd7"
+                "184ea4bf.3b8253"
             ]
         ]
     },
     {
-        "id": "1a7d8db.9a66c72",
+        "id": "138fde4d.c3ff5a",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1449.6666793823242,
-        "y": 908.3333044052124,
-        "z": "3a695320.6f0b9c",
+        "x": 1517.6666717529297,
+        "y": 543.3333463668823,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "c842ed89.31c14"
+                "103298e7.e1370f"
             ]
         ]
     },
     {
-        "id": "c842ed89.31c14",
+        "id": "103298e7.e1370f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1924.190330505371,
-        "y": 924.854106426239,
-        "z": "3a695320.6f0b9c",
+        "x": 1992.1903228759766,
+        "y": 559.8541483879089,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d600b8a.4468d8",
+        "id": "11c2f3bd.05d49c",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1446.6670122146606,
-        "y": 1258.3334305286407,
-        "z": "3a695320.6f0b9c",
+        "x": 1514.667004585266,
+        "y": 893.3334724903107,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "8825b47d.66bfb8"
+                "656a70df.0a852"
             ]
         ]
     },
     {
-        "id": "8825b47d.66bfb8",
+        "id": "656a70df.0a852",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1903.1906328201294,
-        "y": 1262.8542098999023,
-        "z": "3a695320.6f0b9c",
+        "x": 1971.1906251907349,
+        "y": 897.8542518615723,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "a17c5490.82e988",
+        "id": "74c68f10.1e24b8",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1458.3334655761719,
-        "y": 1650.3333506584167,
-        "z": "3a695320.6f0b9c",
+        "x": 1526.3334579467773,
+        "y": 1285.3333926200867,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "d1bea417.250ed8"
+                "9db6cb67.644d78"
             ]
         ]
     },
     {
-        "id": "d1bea417.250ed8",
+        "id": "9db6cb67.644d78",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1884.8571853637695,
-        "y": 1649.854206085205,
-        "z": "3a695320.6f0b9c",
+        "x": 1952.857177734375,
+        "y": 1284.854248046875,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "f32a2384.53396",
+        "id": "9f299b09.7aa55",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1467.0316162109375,
-        "y": 1590.5312571525574,
-        "z": "3a695320.6f0b9c",
+        "x": 1535.031608581543,
+        "y": 1225.5312991142273,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "4c613073.dc407"
+                "4f32f738.55afe"
             ]
         ]
     },
     {
-        "id": "4c613073.dc407",
+        "id": "4f32f738.55afe",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1899.5552215576172,
-        "y": 1590.0519704818726,
-        "z": "3a695320.6f0b9c",
+        "x": 1967.5552139282227,
+        "y": 1225.0520124435425,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "44feac5a.bafec4",
+        "id": "2d6c749d.43234c",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1462.031361579895,
-        "y": 1214.5313940048218,
-        "z": "3a695320.6f0b9c",
+        "x": 1530.0313539505005,
+        "y": 849.5314359664917,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "4888fef.c349b"
+                "6a3e7322.ca712c"
             ]
         ]
     },
     {
-        "id": "4888fef.c349b",
+        "id": "6a3e7322.ca712c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1918.555027961731,
-        "y": 1213.0522079467773,
-        "z": "3a695320.6f0b9c",
+        "x": 1986.5550203323364,
+        "y": 848.0522499084473,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "eaaed7a1.f78188",
+        "id": "cf5adeee.b84288",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1404.2961502075195,
-        "y": 623.5770454406738,
-        "z": "3a695320.6f0b9c",
+        "x": 1472.296142578125,
+        "y": 258.57708740234375,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "67b5956.58f626c"
+                "3f12353b.7c4ed2"
             ]
         ]
     },
     {
-        "id": "bbf1b1a0.c8198",
+        "id": "946dfa0d.22ede8",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1408.2961502075195,
-        "y": 666.2434883117676,
-        "z": "3a695320.6f0b9c",
+        "x": 1476.296142578125,
+        "y": 301.2435302734375,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "67b5956.58f626c"
+                "3f12353b.7c4ed2"
             ]
         ]
     },
     {
-        "id": "67b5956.58f626c",
+        "id": "3f12353b.7c4ed2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1679.296142578125,
-        "y": 644.2435400485992,
-        "z": "3a695320.6f0b9c",
+        "x": 1747.2961349487305,
+        "y": 279.24358201026917,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "296eee7e.c34542"
+                "a64b866a.fe348"
             ]
         ]
     },
     {
-        "id": "296eee7e.c34542",
+        "id": "a64b866a.fe348",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2057.2959899902344,
-        "y": 641.5771992206573,
-        "z": "3a695320.6f0b9c",
+        "x": 2125.29598236084,
+        "y": 276.57724118232727,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "8ee4bce.d47a94",
+        "id": "f9a9efad.b9e6c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2110.3332138061523,
-        "y": 980.3666734695435,
-        "z": "3a695320.6f0b9c",
+        "x": 2178.333206176758,
+        "y": 615.3667154312134,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c5238f2.d394e8",
+        "id": "27d19dc1.bb91e2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1713.3333053588867,
-        "y": 982.0330181121826,
-        "z": "3a695320.6f0b9c",
+        "x": 1781.3332977294922,
+        "y": 617.0330600738525,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "8ee4bce.d47a94"
+                "f9a9efad.b9e6c"
             ]
         ]
     },
     {
-        "id": "1c4e2957.6aa337",
+        "id": "d66cfce5.3961f8",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1455.3332901000977,
-        "y": 1004.0329828262329,
-        "z": "3a695320.6f0b9c",
+        "x": 1523.3332824707031,
+        "y": 639.0330247879028,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "7c5238f2.d394e8"
+                "27d19dc1.bb91e2"
             ]
         ]
     },
     {
-        "id": "9378aa69.5e8c68",
+        "id": "8d371312.adf0b8",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1449.3332595825195,
-        "y": 961.3665351867676,
-        "z": "3a695320.6f0b9c",
+        "x": 1517.333251953125,
+        "y": 596.3665771484375,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "7c5238f2.d394e8"
+                "27d19dc1.bb91e2"
             ]
         ]
     },
     {
-        "id": "75f7964e.785a28",
+        "id": "48d065a3.28be94",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1442.851692199707,
-        "y": 1313.0215034484863,
-        "z": "3a695320.6f0b9c",
+        "x": 1510.8516845703125,
+        "y": 948.0215454101562,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "d9bd0e30.34f56"
+                "99be455.f37d838"
             ]
         ]
     },
     {
-        "id": "265de382.3a352c",
+        "id": "a2afb217.467ef8",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1434.8516693115234,
-        "y": 1354.687891960144,
-        "z": "3a695320.6f0b9c",
+        "x": 1502.851661682129,
+        "y": 989.687933921814,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "d9bd0e30.34f56"
+                "99be455.f37d838"
             ]
         ]
     },
     {
-        "id": "d9bd0e30.34f56",
+        "id": "99be455.f37d838",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1692.8516845703125,
-        "y": 1332.6879272460938,
-        "z": "3a695320.6f0b9c",
+        "x": 1760.851676940918,
+        "y": 967.6879692077637,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "8de8e467.90b458"
+                "6c44d81a.9e145"
             ]
         ]
     },
     {
-        "id": "8de8e467.90b458",
+        "id": "6c44d81a.9e145",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2070.851531982422,
-        "y": 1330.0215864181519,
-        "z": "3a695320.6f0b9c",
+        "x": 2138.8515243530273,
+        "y": 965.0216283798218,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
     },
     {
-        "id": "74bbe07e.451bd",
+        "id": "3ebbe3a2.8b462c",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1449.333381652832,
-        "y": 1697.36665725708,
-        "z": "3a695320.6f0b9c",
+        "x": 1517.3333740234375,
+        "y": 1332.36669921875,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "3c752813.4a8be8"
+                "998a2bef.b013e8"
             ]
         ]
     },
     {
-        "id": "3b13f0b3.196eb",
+        "id": "c94b17f8.0cedb",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1449.333381652832,
-        "y": 1738.0332221984863,
-        "z": "3a695320.6f0b9c",
+        "x": 1517.3333740234375,
+        "y": 1373.0332641601562,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "3c752813.4a8be8"
+                "998a2bef.b013e8"
             ]
         ]
     },
     {
-        "id": "3c752813.4a8be8",
+        "id": "998a2bef.b013e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1699.3333740234375,
-        "y": 1717.0330810546875,
-        "z": "3a695320.6f0b9c",
+        "x": 1767.333366394043,
+        "y": 1352.0331230163574,
+        "z": "8e56a38a.ed9008",
         "wires": [
             [
-                "489ba469.b5b07c"
+                "d4dcf7f5.c6d7"
             ]
         ]
     },
     {
-        "id": "489ba469.b5b07c",
+        "id": "d4dcf7f5.c6d7",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2077.333221435547,
-        "y": 1714.3667402267456,
-        "z": "3a695320.6f0b9c",
+        "x": 2145.3332138061523,
+        "y": 1349.3667821884155,
+        "z": "8e56a38a.ed9008",
         "wires": [
             []
         ]
-    },
-    {
-        "id": "df2a6c25.b6e3a",
-        "type": "set",
-        "name": "set skip-mdsal-update to Y",
-        "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
-        "comments": "",
-        "x": 1298.8888816833496,
-        "y": 292.7778091430664,
-        "z": "3a695320.6f0b9c",
-        "wires": []
-    },
-    {
-        "id": "5b2c165f.6d5c88",
-        "type": "set",
-        "name": "set ack-final to 'N'",
-        "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
-        "comments": "",
-        "x": 1270.6984786987305,
-        "y": 359.98305320739746,
-        "z": "3a695320.6f0b9c",
-        "wires": []
-    },
-    {
-        "id": "a2f63855.285858",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1053.6666717529297,
-        "y": 328.5555648803711,
-        "z": "3a695320.6f0b9c",
-        "wires": [
-            [
-                "df2a6c25.b6e3a",
-                "5b2c165f.6d5c88"
-            ]
-        ]
-    },
-    {
-        "id": "f5ec8f1c.ba6fb",
-        "type": "comment",
-        "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",
-        "info": "",
-        "comments": "",
-        "x": 1474.4444885253906,
-        "y": 386.66668605804443,
-        "z": "3a695320.6f0b9c",
-        "wires": []
     }
 ]
 \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 82c79c8f..065a656b 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -113,8 +113,6 @@ GENERIC-RESOURCE-API self-serve-aai-pnf-put ${project.version} sync
 GENERIC-RESOURCE-API self-serve-capability-param-resolution ${project.version} sync
 GENERIC-RESOURCE-API self-serve-pnf-generate-name ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vnf-generate-name ${project.version} sync
-GENERIC-RESOURCE-API self-serve-vnf-mdsal-put ${project.version} sync
-GENERIC-RESOURCE-API self-serve-vf-module-mdsal-put ${project.version} sync
 GENERIC-RESOURCE-API self-serve-vf-module-generate-name ${project.version} sync
 GENERIC-RESOURCE-API self-serve-generate-name ${project.version} sync
 GENERIC-RESOURCE-API self-serve-generate-name-changeassign ${project.version} sync
@@ -183,7 +181,6 @@ GENERIC-RESOURCE-API vf-module-topology-operation-activate ${project.version} sy
 GENERIC-RESOURCE-API vf-module-topology-operation-assign-no-preload ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-assign-preload ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-assign ${project.version} sync
-GENERIC-RESOURCE-API vf-module-topology-operation-async ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-changeassign ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API vf-module-topology-operation-unassign ${project.version} sync
@@ -195,7 +192,6 @@ GENERIC-RESOURCE-API vf-module-topology-vlan-tagging-ip-addresses ${project.vers
 GENERIC-RESOURCE-API vnf-get-resource-request ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-activate ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-assign ${project.version} sync
-GENERIC-RESOURCE-API vnf-topology-operation-async ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-changeassign ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-unassign ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index d2bb3a0c..de88ad7d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
@@ -245,13 +245,75 @@ ss.capability.execution-order
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                        <parameter name='vf.vf-module-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
+                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
+                                                        <parameter name='vf.vf-module-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
+                                                        <parameter name='vf.vf-module-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
+                                                        <parameter name='vf.vf-module-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />
                                                     </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{service-instance-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vnf-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vf-module-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='httpMethod' value='PUT' />
+                                                        <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />
+                                                        <outcome value='failure'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                    </execute>
                                                     <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
                                                         <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
+                                                        <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
                                                     </return>
                                                 </block>
                                             </outcome>
@@ -268,13 +330,75 @@ ss.capability.execution-order
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
+                                                        <parameter name='vf.vf-module-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
+                                                        <parameter name='vf.vf-module-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
+                                                        <parameter name='vf.vf-module-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
+                                                        <parameter name='vf.vf-module-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
+                                                        <parameter name='vf.vf-module-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
+                                                        <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />
                                                     </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{service-instance-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vnf-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
+                                                        <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
+                                                        <parameter name="target" value="{vf-module-id}"/>
+                                                        <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
+                                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />
+                                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='httpMethod' value='PUT' />
+                                                        <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />
+                                                        <outcome value='failure'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <set>
+                                                                <parameter name="error-message" value="Failed to persist self-serve vf-module assignments during assign in MD-SAL" />
+                                                            </set>
+                                                        </outcome>
+                                                    </execute>
                                                     <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
                                                         <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
+                                                        <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
                                                     </return>
                                                 </block>
                                             </outcome>
@@ -293,7 +417,6 @@ ss.capability.execution-order
                     </switch>
                 </for>
             </for>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-mdsal-put' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vf-assign.log' />
             </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
deleted file mode 100644
index 76b60872..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-mdsal-put.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-vf-module-mdsal-put' mode='sync'>
-        <block atomic='true'>
-            <set>
-                <parameter name='vf.vf-module-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />
-                <parameter name='vf.vf-module-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />
-                <parameter name='vf.vf-module-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />
-                <parameter name='vf.vf-module-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />
-                <parameter name='vf.vf-module-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />
-                <parameter name='vf.vf-module-data.vf-module-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />
-                <parameter name='vf.vf-module-data.vf-module-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />
-                <parameter name='vf.vf-module-data.vf-module-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.request-version'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />
-                <parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.ss-vfmodule-assignments`"/>
-                <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                <parameter name="target" value="{vnf-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.ss-vfmodule-url`"/>
-                <parameter name="outputPath" value="tmp.ss-vfmodule-url"/>
-                <parameter name="target" value="{vf-module-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ss-vfmodule" />
-                <outcome value='failure'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vf-module assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-                <outcome value='not-found'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vf-module assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-            </execute>
-        </block>
-    </method>
-</service-logic>
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
index 96db3efe..c8b52b29 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
@@ -223,62 +223,154 @@ ss.capability.execution-order[]
                     </set>
                     <switch test='`$ss.capability-name == $tmp.param.capability-name`'>
                         <outcome value='true'>
-                            <block atomic='true'>
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
-                                    <outcome value='PENDING'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                            <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
-                                                    </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
-                                                    </return>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='success'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="`'EXECUTION DONE: ' + $ss.capability-dg`"/>
-                                                </record>
-                                            </outcome>
-                                        </call>
-                                    </outcome>
-                                    <outcome value='FAILED'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
-                                            <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`'Encountered error from ' + $ss.capability-dg + ' with error: ' + $error-message`" />
-                                                    </set>
-                                                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name='error-code' value='500' />
-                                                        <parameter name='error-message' value="`$error-message`" />
-                                                    </return>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='success'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="`'EXECUTION DONE: ' + $ss.capability-dg`"/>
-                                                </record>
-                                            </outcome>
-                                        </call>
-                                    </outcome>
-                                </switch>
-                                <break/>
-                            </block>
+                            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>
+                                <outcome value='PENDING'>
+                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='vf.vnf-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
+                                                    <parameter name='vf.vnf-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
+                                                    <parameter name='vf.vnf-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
+                                                    <parameter name='vf.vnf-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
+                                                    <parameter name='vf.vnf-data.vnf-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
+                                                </set>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{service-instance-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$tmp.ss-vnf-url`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{vnf-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
+                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
+                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                    <parameter name='format' value='json' />
+                                                    <parameter name='httpMethod' value='PUT' />
+                                                    <parameter name="responsePrefix" value="mdsal-ss-vnf" />
+                                                    <outcome value='failure'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                </execute>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='500' />
+                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </call>
+                                </outcome>
+                                <outcome value='FAILED'>
+                                    <call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='vf.vnf-id'
+    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
+                                                    <parameter name='vf.vnf-data.sdnc-request-header.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
+                                                    <parameter name='vf.vnf-data.request-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
+                                                    <parameter name='vf.vnf-data.service-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-information.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
+                                                    <parameter name='vf.vnf-data.vnf-topology.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
+                                                    <parameter name='vf.vnf-data.vnf-level-oper-status.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.request-version'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.tenant'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
+                                                    <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
+  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
+                                                </set>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{service-instance-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$tmp.ss-vnf-url`"/>
+                                                    <parameter name="outputPath" value="tmp.ss-vnf-url"/>
+                                                    <parameter name="target" value="{vnf-id}"/>
+                                                    <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
+                                                </execute>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
+                                                    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
+                                                    <parameter name='restapiUser' value='`$prop.controller.user`' />
+                                                    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                                                    <parameter name='format' value='json' />
+                                                    <parameter name='httpMethod' value='PUT' />
+                                                    <parameter name="responsePrefix" value="mdsal-ss-vnf" />
+                                                    <outcome value='failure'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <set>
+                                                            <parameter name="error-message" value="Failed to persist self-serve vnf assignments during assign in MD-SAL" />
+                                                        </set>
+                                                    </outcome>
+                                                </execute>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='500' />
+                                                    <parameter name='error-message' value="`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`" />
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                    </call>
+                                </outcome>
+                            </switch>
                         </outcome>
                     </switch>
                 </for>
             </for>
-            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-mdsal-put' mode='sync' ></call>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                 <parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />
             </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
deleted file mode 100644
index a35b4c1b..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-mdsal-put.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='self-serve-vnf-mdsal-put' mode='sync'>
-        <block atomic='true'>
-            <set>
-                <parameter name='vf.vnf-id'
-    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />
-                <parameter name='vf.vnf-data.sdnc-request-header.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />
-                <parameter name='vf.vnf-data.request-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />
-                <parameter name='vf.vnf-data.service-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />
-                <parameter name='vf.vnf-data.vnf-information.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />
-                <parameter name='vf.vnf-data.vnf-topology.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />
-                <parameter name='vf.vnf-data.vnf-level-oper-status.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />
-                <parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />
-                <parameter name='vf.vnf-data.vnf-request-input.request-version'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />
-                <parameter name='vf.vnf-data.vnf-request-input.vnf-name'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />
-                <parameter name='vf.vnf-data.vnf-request-input.tenant'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />
-                <parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />
-                <parameter name='vf.vnf-data.vnf-request-input.aic-clli'
-  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.ss-vnf-assignments`"/>
-                <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$tmp.ss-vnf-url`"/>
-                <parameter name="outputPath" value="tmp.ss-vnf-url"/>
-                <parameter name="target" value="{vnf-id}"/>
-                <parameter name="replacement" value="`$service-data.vnfs.vnf[$vnf-index].vnf-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ss-vnf" />
-                <outcome value='failure'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vnf assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-                <outcome value='not-found'>
-                    <set>
-                        <parameter name="error-message" value="`'Failed to persist self-serve vnf assignments during assign in MD-SAL. ' + $error-message`" />
-                    </set>
-                </outcome>
-            </execute>
-        </block>
-    </method>
-</service-logic>
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index 5f1fd438..b7888ede 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
@@ -1,6 +1,6 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1-4-2-20181108R1'>
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
     <method rpc='vf-module-topology-operation-assign' mode='sync'>
         <block atomic="true">
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
@@ -22,77 +22,29 @@
                     <block></block>
                 </outcome>
                 <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'" />
+                    </return>
                 </outcome>
             </switch>
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-module-model'>
                 <outcome value='failure'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error reading VF_MODULE_MODEL table" />
+                    </return>
                 </outcome>
                 <outcome value='not-found'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`" />
+                    </return>
                 </outcome>
             </get-resource>
             <set>
@@ -100,27 +52,11 @@
             </set>
             <switch test='`$service-data.vnfs.vnf_length`'>
                 <outcome value=''>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="There are no VNFs defined in MD-SAL" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="There are no VNFs defined in MD-SAL" />
+                    </return>
                 </outcome>
                 <outcome value='Other'>
                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
@@ -139,27 +75,11 @@
             </switch>
             <switch test='`$vnf-index`'>
                 <outcome value='-1'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`" />
+                    </return>
                 </outcome>
             </switch>
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-forking-logic' mode='sync' ></call>
@@ -168,27 +88,11 @@
                     <block atomic="true">
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`" />
+                                </return>
                             </outcome>
                         </call>
                         <set>
@@ -197,19 +101,11 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'
-  value='`$vf-module-topology-operation-input.request-information.request-action`' />
+  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
                         </set>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/ss-vnfend.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                            <parameter name="input.ack-final-indicator" value="Y" />
-                            <parameter name="input.response-code" value="200" />
-                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                        </configure>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
@@ -233,28 +129,12 @@
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >
                                         <switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id == $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id`'>
                                             <outcome value='true'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id
        + ' already exists, and status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-level-oper-status.order-status`" />
-                                                    </set>
-                                                    <block>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
-                                                </block>
+                                                </return>
                                             </outcome>
                                         </switch>
                                     </for>
@@ -281,50 +161,18 @@
 		     cloud-region.cloud-region-id = $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region"
         pfx='aai.cloud-region' local-only='false' >
                             <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Cloud region not found in AAI" />
-                                    </set>
-                                    <block>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Cloud region not found in AAI" />
+                                </return>
                             </outcome>
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error retrieving cloud region from AAI.  Is AAI down?" />
-                                    </set>
-                                    <block>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error retrieving cloud region from AAI" />
+                                </return>
                             </outcome>
                         </get-resource>
                         <for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >
@@ -347,27 +195,11 @@
                         </for>
                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.aic-clli`'>
                             <outcome value=''>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`" />
-                                    </set>
-                                    <block>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`" />
+                                </return>
                             </outcome>
                         </switch>
                         <switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>
@@ -435,26 +267,8 @@
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >
                                     <outcome value='failure'>
                                         <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'from-preload flag is true but could not find preload information for VF module name ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-name`" />
-                                            </set>
-                                            <block atomic='true'>
-                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
-                                            </block>
+                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                            <return status='failure'></return>
                                         </block>
                                     </outcome>
                                 </call>
@@ -474,52 +288,20 @@
                                                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >
                                                         <outcome value='failure'>
                                                             <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="`'from-preload flag is true but could not find preload information for VF module name ' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-name`" />
-                                                                </set>
-                                                                <block atomic='true'>
-                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                        <parameter name="input.response-code" value="500" />
-                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                    </configure>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                    </return>
-                                                                </block>
+                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                <return status='failure'></return>
                                                             </block>
                                                         </outcome>
                                                     </call>
                                                 </outcome>
                                                 <outcome value='Other'>
                                                     <block atomic="true">
-                                                        <set>
+                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
                                                             <parameter name="error-message" value="Error retrieving preload-information" />
-                                                        </set>
-                                                        <block atomic='true'>
-                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                <parameter name="input.response-code" value="500" />
-                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                            </configure>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`$error-message`" />
-                                                            </return>
-                                                        </block>
+                                                        </return>
                                                     </block>
                                                 </outcome>
                                             </switch>
@@ -529,22 +311,9 @@
                                         <block>
                                             <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-preload' mode='sync' >
                                                 <outcome value='failure'>
-                                                    <block atomic='true'>
+                                                    <block atomic="true">
                                                         <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
+                                                        <return status='failure'></return>
                                                     </block>
                                                 </outcome>
                                             </call>
@@ -595,29 +364,15 @@
                                         <switch test='`$vnf-network-index`'>
                                             <outcome value='-1'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="`'VNFC network role '
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-network-role
       + ' is not found in VNF network list'
       `" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -676,56 +431,28 @@
                                                                                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].network-start-address`'>
                                                                                             <outcome value=''>
                                                                                                 <block atomic="true">
-                                                                                                    <set>
+                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                        <parameter name="error-code" value="500" />
                                                                                                         <parameter name="error-message" value="`'SDNC subnet id '
       + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id
       + ' does not have network-start-address populated'`" />
-                                                                                                    </set>
-                                                                                                    <block atomic='true'>
-                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                            <parameter name="input.response-code" value="500" />
-                                                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                                        </configure>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                                                        </return>
-                                                                                                    </block>
+                                                                                                    </return>
                                                                                                 </block>
                                                                                             </outcome>
                                                                                             <outcome value='Other'>
                                                                                                 <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].cidr-mask`'>
                                                                                                     <outcome value=''>
                                                                                                         <block atomic="true">
-                                                                                                            <set>
+                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
                                                                                                                 <parameter name="error-message" value="`'SDNC subnet id '
       + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id
       + ' does not have cidr-mask populated'`" />
-                                                                                                            </set>
-                                                                                                            <block atomic='true'>
-                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                                    <parameter name="input.response-code" value="500" />
-                                                                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                                                </configure>
-                                                                                                                <return status='failure'>
-                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                                                                </return>
-                                                                                                            </block>
+                                                                                                            </return>
                                                                                                         </block>
                                                                                                     </outcome>
                                                                                                     <outcome value='Other'>
@@ -767,28 +494,14 @@
                                                                             <switch test='`$subnet-id`'>
                                                                                 <outcome value='-1'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="`'Not able to find VNF network subnet that contains address '
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[0].vnfc-ip-address
       `" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </switch>
@@ -820,27 +533,13 @@
     and network_role = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-role'
   pfx='db.vnf-related-network-role[]'>
                                             <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <set>
+                                                <block>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Error reading VFC_RELATED_NETWORK_ROLE table" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='success'>
@@ -877,28 +576,14 @@
                                                         </for>
                                                         <switch test='`$found-related-network`'>
                                                             <outcome value='false'>
-                                                                <block atomic='true'>
-                                                                    <set>
+                                                                <block>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="`'Unable to find related network '
       + $db.vnf-related-network-role[$db-related-network-index].related-network-role + ' in vnf-networks'`" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                         </switch>
@@ -977,33 +662,22 @@
                             <parameter name="automated-assignment" value="`$automated-assignment`" />
                             <outcome value='failure'>
                                 <block atomic="true">
-                                    <set>
+                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
                                         <parameter name="error-message" value="Error updating vf-module in AAI" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
                                 <block atomic="true">
-                                    <set>
+                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
                                         <parameter name="error-message" value="`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />
-                                    </set>
+                                    </return>
                                 </block>
                             </outcome>
                         </update>
@@ -1048,50 +722,22 @@
                                                     <parameter name="prov-status" value="`PREPROV`" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1111,50 +757,22 @@
                                                     <parameter name="prov-status" value="`PREPROV`" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vnfc to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1179,50 +797,22 @@
         $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />
                                             <outcome value='failure'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Error updating vnfc relationships in AAI" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='not-found'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Not-found error updating vnfc relationships" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </save>
@@ -1239,50 +829,22 @@
                                                     <parameter name="port-id" value="0" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Error saving cp object to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error creating cp object in AAI" />
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Error saving cp object to AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error creating cp object in AAI" />
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1313,26 +875,12 @@
                                                                                 <parameter name="is-floating" value="false" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error creating l3-interface-ipv4-address-list object in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1354,50 +902,22 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id`" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error updating l3-interface-ipv4-address-list relationships in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='not-found'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Not-found error updating l3-interface-ipv4-address-list relationships" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1415,26 +935,12 @@
                                                                                 <parameter name="is-floating" value="false" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error creating l3-interface-ipv6-address-list object in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1456,50 +962,22 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$network-role-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].subnet-id`" />
                                                                                 <outcome value='failure'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Error updating l3-interface-ipv6-address-list relationships in AAI" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='not-found'>
                                                                                     <block atomic="true">
-                                                                                        <set>
+                                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
                                                                                             <parameter name="error-message" value="Not-found error updating l3-interface-ipv6-address-list relationships" />
-                                                                                        </set>
-                                                                                        <block atomic='true'>
-                                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
-                                                                                        </block>
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </save>
@@ -1525,50 +1003,22 @@
         $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].network-id`" />
                                                                 <outcome value='failure'>
                                                                     <block atomic="true">
-                                                                        <set>
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
                                                                             <parameter name="error-message" value="Error updating cp relationship to l3-network in AAI" />
-                                                                        </set>
-                                                                        <block atomic='true'>
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                <parameter name="input.response-code" value="500" />
-                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                            </configure>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                            </return>
-                                                                        </block>
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                                 <outcome value='not-found'>
                                                                     <block atomic="true">
-                                                                        <set>
+                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
                                                                             <parameter name="error-message" value="Not-found error updating cp relationship to l3-network" />
-                                                                        </set>
-                                                                        <block atomic='true'>
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                <parameter name="input.response-code" value="500" />
-                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                            </configure>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                            </return>
-                                                                        </block>
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                             </save>
@@ -1595,50 +1045,22 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].related-networks.related-network[$related-network-index].vlan-tags.vlan-interface`" />
                                                                     <outcome value='failure'>
                                                                         <block atomic="true">
-                                                                            <set>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
                                                                                 <parameter name="error-message" value="Error updating cp relationship to l3-network and vlan-tag in AAI" />
-                                                                            </set>
-                                                                            <block atomic='true'>
-                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                    <parameter name="input.response-code" value="500" />
-                                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                </configure>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                                </return>
-                                                                            </block>
+                                                                            </return>
                                                                         </block>
                                                                     </outcome>
                                                                     <outcome value='not-found'>
                                                                         <block atomic="true">
-                                                                            <set>
+                                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
                                                                                 <parameter name="error-message" value="Not-found error updating cp relationship to l3-network and vlan-tag" />
-                                                                            </set>
-                                                                            <block atomic='true'>
-                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                    <parameter name="input.response-code" value="500" />
-                                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                </configure>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                                </return>
-                                                                            </block>
+                                                                            </return>
                                                                         </block>
                                                                     </outcome>
                                                                 </save>
@@ -1663,51 +1085,23 @@
         $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`" />
                                             <outcome value='failure'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="Error updating vf-module relationships in AAI" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='not-found'>
                                                 <block atomic="true">
-                                                    <set>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
                                                         <parameter name="error-message" value="`'No l3-network found in AAI for network ID '
       + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </save>
@@ -1726,50 +1120,22 @@
                                                     <parameter name="is-floating" value="false" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vip-ipv4-address-list in AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Not-found error saving vip-ipv4-address-list" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1796,50 +1162,22 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`" />
                                                             <outcome value='failure'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Error updating vip-ipv4-address-list relationships in AAI" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationships" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                         </save>
@@ -1861,50 +1199,22 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].connection-point.connection-point-id`" />
                                                                         <outcome value='failure'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Error updating vip-ipv4-address-list relationship to cp in AAI" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                         <outcome value='not-found'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationship to cp" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                     </save>
@@ -1927,50 +1237,22 @@
                                                     <parameter name="is-floating" value="false" />
                                                     <outcome value='failure'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Error saving vip-ipv6-address-list in AAI" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                     <outcome value='not-found'>
                                                         <block atomic="true">
-                                                            <set>
+                                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
                                                                 <parameter name="error-message" value="Not-found error saving vip-ipv6-address-list" />
-                                                            </set>
-                                                            <block atomic='true'>
-                                                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
+                                                            </return>
                                                         </block>
                                                     </outcome>
                                                 </save>
@@ -1997,50 +1279,22 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-name`" />
                                                             <outcome value='failure'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Error updating vip-ipv6-address-list relationships in AAI" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>
                                                                 <block atomic="true">
-                                                                    <set>
+                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
                                                                         <parameter name="error-message" value="Not-found error updating vip-ipv6-address-list relationships" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
+                                                                    </return>
                                                                 </block>
                                                             </outcome>
                                                         </save>
@@ -2062,50 +1316,20 @@
         + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-role-index].connection-point.connection-point-id`" />
                                                                         <outcome value='failure'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Error updating vip-ipv4-address-list relationship to cp in AAI" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                         <outcome value='not-found'>
                                                                             <block atomic="true">
-                                                                                <set>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
                                                                                     <parameter name="error-message" value="Not-found error updating vip-ipv4-address-list relationship to cp" />
-                                                                                </set>
-                                                                                <block atomic='true'>
-                                                                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                        <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                        <parameter name="input.response-code" value="500" />
-                                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                                        <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                        <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                        <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                                                                    </configure>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                                    </return>
-                                                                                </block>
+                                                                                </return>
                                                                             </block>
                                                                         </outcome>
                                                                     </save>
@@ -2123,26 +1347,11 @@
                         <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >
                             <outcome value='failure'>
                                 <block atomic="true">
+                                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                                         <parameter name='filename' value='/var/tmp/bgb-vlantaggingfailure.log' />
                                     </execute>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
+                                    <return status='failure'></return>
                                 </block>
                             </outcome>
                         </call>
@@ -2208,74 +1417,9 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'
   value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
                         </set>
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vf-module-assign.json'`" />
-                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vf-module.url`" />
-                            <parameter name='restapiUser' value='`$prop.controller.user`' />
-                            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                            <parameter name='format' value='json' />
-                            <parameter name='httpMethod' value='PUT' />
-                            <parameter name="responsePrefix" value="vf-module-assign" />
-                            <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vf-module" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vf-module" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
-                            </outcome>
-                        </execute>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                            <parameter name="input.ack-final-indicator" value="Y" />
-                            <parameter name="input.response-code" value="200" />
-                            <parameter name="input.svc-request-id" value="`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vf-module-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vf-module-topology-operation-input.service-information.service-instance-id`" />
-                        </configure>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
@@ -2286,4 +1430,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>
         </block>
     </method>
-</service-logic>
-\ No newline at end of file
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
deleted file mode 100644
index 4c89d83b..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-async.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='vf-module-topology-operation-async' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='skip-mdsal-update' value='Y' />
-            </set>
-            <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
-                <outcome value='assign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
-                    </return>
-                </outcome>
-            </switch>
-            <return status='success'>
-                <parameter name="ack-final" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index dae4b9b9..24863d44 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -6,14 +6,7 @@
             <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='skip-mdsal-update' value='Y' />
-                        </set>
-                        <set>
-                            <parameter name='ack-final' value='N' />
-                        </set>
-                    </block>
+                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>
                 </outcome>
                 <outcome value='unassign'>
                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' ></call>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
index 0b90096b..1433b7b5 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml
@@ -22,77 +22,29 @@
                     <block></block>
                 </outcome>
                 <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVnfInstance'" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'CreateVnfInstance'" />
+                    </return>
                 </outcome>
             </switch>
             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-model'>
                 <outcome value='failure'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="Error reading VF_MODEL table" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error reading VF_MODEL table" />
+                    </return>
                 </outcome>
                 <outcome value='not-found'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />
-                        </set>
-                        <block atomic='true'>
-                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                <parameter name="input.ack-final-indicator" value="Y" />
-                                <parameter name="input.response-code" value="500" />
-                                <parameter name="input.response-message" value="`$error-message`" />
-                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                            </configure>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </block>
-                    </block>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`" />
+                    </return>
                 </outcome>
             </get-resource>
             <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>
@@ -101,27 +53,11 @@
                     <block atomic="true">
                         <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`" />
-                                    </set>
-                                    <block atomic='true'>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`" />
+                                </return>
                             </outcome>
                         </call>
                         <set>
@@ -132,14 +68,6 @@
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/ss-vnfend.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                            <parameter name="input.ack-final-indicator" value="Y" />
-                            <parameter name="input.response-code" value="200" />
-                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                        </configure>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
@@ -156,35 +84,19 @@
                                 </set>
                             </outcome>
                             <outcome value='Other'>
-                                <block atomic='true'>
+                                <block>
                                     <set>
                                         <parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />
                                     </set>
                                     <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
                                         <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>
                                             <outcome value='true'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id
       + ' already exists'`" />
-                                                    </set>
-                                                    <block atomic='true'>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
-                                                    </block>
-                                                </block>
+                                                </return>
                                             </outcome>
                                         </switch>
                                     </for>
@@ -204,52 +116,20 @@
 		key="instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id"
         pfx='aai.instance-group' local-only='false' >
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'Cannot find instance group id ' +
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Cannot find instance group id ' +
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id
       + ' in AAI'`" />
-                                            </set>
-                                            <block atomic='true'>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
-                                            </block>
-                                        </block>
+                                        </return>
                                     </outcome>
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error retrieving instance-group from AAI" />
-                                            </set>
-                                            <block atomic='true'>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
-                                            </block>
-                                        </block>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error retrieving instance-group from AAI" />
+                                        </return>
                                     </outcome>
                                 </get-resource>
                                 <for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >
@@ -260,53 +140,20 @@
 		key="collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
         pfx='aai.collection' local-only='false' >
                                                 <outcome value='not-found'>
-                                                    <block atomic="true">
-                                                        <set>
-                                                            <parameter name="error-message" value="`'Unable to find AAI relationship from collection '
-      + $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value
-      + ' to service instance'`" />
-                                                        </set>
-                                                        <block atomic='true'>
-                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                <parameter name="input.response-code" value="500" />
-                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                            </configure>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`$error-message`" />
-                                                            </return>
-                                                        </block>
-                                                    </block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Cannot find collection ' +
+      $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value
+      + ' in AAI'`" />
+                                                    </return>
                                                 </outcome>
                                                 <outcome value='failure'>
-                                                    <block atomic="true">
-                                                        <set>
-                                                            <parameter name="error-message" value="`'Failed to get network service instance '
-      + $network-service-instance + ' from MD-SAL'`" />
-                                                        </set>
-                                                        <block atomic='true'>
-                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                <parameter name="input.response-code" value="500" />
-                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                            </configure>
-                                                            <return status='failure'>
-                                                                <parameter name='ack-final' value='Y'/>
-                                                                <parameter name="error-code" value="500" />
-                                                                <parameter name="error-message" value="`$error-message`" />
-                                                            </return>
-                                                        </block>
-                                                    </block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="System error retrieving collection from AAI" />
+                                                    </return>
                                                 </outcome>
                                                 <outcome value='success'>
                                                     <block atomic="true">
@@ -328,30 +175,13 @@
                                                         </for>
                                                         <switch test='`$found-network-instance-group`'>
                                                             <outcome value='false'>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name="error-message" value="`'Could not find network instance group ' +
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Could not find network instance group ' +
       $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id
-      + ' in MD-SAL service instance '
-      + $network-service-instance`" />
-                                                                    </set>
-                                                                    <block atomic='true'>
-                                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                                            <parameter name="input.response-code" value="500" />
-                                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                        </configure>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="`$error-message`" />
-                                                                        </return>
-                                                                    </block>
-                                                                </block>
+      + ' in MD-SAL'`" />
+                                                                </return>
                                                             </outcome>
                                                         </switch>
                                                         <set>
@@ -405,50 +235,18 @@
                                             <block></block>
                                         </outcome>
                                         <outcome value='N'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
-                                                </set>
-                                                <block>
-                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                        <parameter name="input.response-code" value="500" />
-                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                    </configure>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`$error-message`" />
-                                                    </return>
-                                                </block>
-                                            </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
+                                            </return>
                                         </outcome>
                                         <outcome value='Other'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
-                                                </set>
-                                                <block>
-                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                        <parameter name="input.response-code" value="500" />
-                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                    </configure>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`$error-message`" />
-                                                    </return>
-                                                </block>
-                                            </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="No vnf-name was received but ecomp-generated-naming is not Y" />
+                                            </return>
                                         </outcome>
                                     </switch>
                                     <switch test='`$db.vf-model.naming-policy`'>
@@ -464,27 +262,11 @@
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
                                                     <outcome value='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
-                                                            </set>
-                                                            <block>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
-                                                        </block>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
+                                                        </return>
                                                     </outcome>
                                                     <outcome value='success'>
                                                         <set>
@@ -505,27 +287,11 @@
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >
                                                     <outcome value='failure'>
-                                                        <block atomic="true">
-                                                            <set>
-                                                                <parameter name="error-message" value="Unable to generate VNF name" />
-                                                            </set>
-                                                            <block>
-                                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                                    <parameter name="input.response-code" value="500" />
-                                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                </configure>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`$error-message`" />
-                                                                </return>
-                                                            </block>
-                                                        </block>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="Unable to generate VNF name" />
+                                                        </return>
                                                     </outcome>
                                                     <outcome value='success'>
                                                         <set>
@@ -619,10 +385,7 @@
 		     depth='all'"
         pfx='aai.cloud-region' local-only='false' >
                             <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Cloud region not found in AAI" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -630,28 +393,16 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
                                     </block>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Cloud region not found in AAI" />
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -659,21 +410,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
                                     </block>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error retrieving cloud region from AAI" />
+                                    </return>
                                 </block>
                             </outcome>
                         </get-resource>
@@ -697,10 +439,7 @@
                         </for>
                         <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>
                             <outcome value=''>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -708,21 +447,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
                                     </block>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
+                                    </return>
                                 </block>
                             </outcome>
                         </switch>
@@ -730,10 +460,7 @@
   key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
   pfx='db.vf-network-role-mapping[]'>
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -741,21 +468,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
                                     </block>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error reading VF_TO_NETWORK_ROLE_MAPPING table" />
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
@@ -789,10 +507,7 @@
         pfx='aai.l3-network' local-only='false'
 >
                                             <outcome value='not-found'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -800,28 +515,18 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
                                                     </block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'No active l3-network found in AAI with cloud_region_id '
+          + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + ' and network_role '
+          + $db.vf-network-role-mapping[$network-index].network-role`" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='failure'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -829,21 +534,12 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
                                                     </block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error retrieving l3-network from AAI" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </get-resource>
@@ -926,10 +622,7 @@
                                         </block>
                                         <switch test='`$l3-network-id`'>
                                             <outcome value='-1'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -937,21 +630,12 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
                                                     </block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -1049,10 +733,7 @@
     and network_role = $db.vf-network-role-mapping[$role-index].network-role'
   pfx='db.vnf-related-network-role[]'>
                                             <outcome value='failure'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />
-                                                    </set>
+                                                <block>
                                                     <block atomic="true">
                                                         <set>
                                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1060,21 +741,12 @@
                                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                         </set>
                                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                                            <parameter name="input.response-code" value="500" />
-                                                            <parameter name="input.response-message" value="`$error-message`" />
-                                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                        </configure>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`$error-message`" />
-                                                        </return>
                                                     </block>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error reading VNF_RELATED_NETWORK_ROLE table" />
+                                                    </return>
                                                 </block>
                                             </outcome>
                                             <outcome value='success'>
@@ -1099,14 +771,7 @@
                                                         <parameter name='httpMethod' value='GET' />
                                                         <parameter name="responsePrefix" value="mdsal-ntis" />
                                                         <outcome value='failure'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="`
-    'Error retrieving network-topology-identifier-structure for service instance '
-    + $network-service-instance-id
-    + ' and network-id '
-    + $l3-network-id`" />
-                                                                </set>
+                                                            <block>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1114,21 +779,16 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                        <parameter name="input.response-code" value="500" />
-                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                    </configure>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                    </return>
                                                                 </block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`
+    'Error retrieving network-topology-identifier-structure for service instance '
+    + $network-service-instance-id
+    + ' and network-id '
+    + $l3-network-id`" />
+                                                                </return>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -1148,10 +808,7 @@
                                                         <parameter name="start_length" value="1" />
                                                         <parameter name="query" value="/query/owning-entity-fromService-instance" />
                                                         <outcome value='failure'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />
-                                                                </set>
+                                                            <block>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1159,28 +816,16 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                        <parameter name="input.response-code" value="500" />
-                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                    </configure>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                    </return>
                                                                 </block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Error getting owning entity from service instance" />
+                                                                </return>
                                                             </block>
                                                         </outcome>
                                                         <outcome value='not-found'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />
-                                                                </set>
+                                                            <block>
                                                                 <block atomic="true">
                                                                     <set>
                                                                         <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1188,21 +833,12 @@
                                                                         <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                     </set>
                                                                     <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                    <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                        <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                        <parameter name="input.ack-final-indicator" value="Y" />
-                                                                        <parameter name="input.response-code" value="500" />
-                                                                        <parameter name="input.response-message" value="`$error-message`" />
-                                                                        <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                        <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                        <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                    </configure>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`$error-message`" />
-                                                                    </return>
                                                                 </block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Unable to find owning entity from service instance" />
+                                                                </return>
                                                             </block>
                                                         </outcome>
                                                     </save>
@@ -1229,10 +865,7 @@
                                                                 <parameter name="query" value="`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role
   + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
                                                                 <outcome value='failure'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />
-                                                                        </set>
+                                                                    <block>
                                                                         <block atomic="true">
                                                                             <set>
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1240,29 +873,16 @@
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                             </set>
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                <parameter name="input.response-code" value="500" />
-                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                            </configure>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                            </return>
                                                                         </block>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="Error calling getNetworks custom query in AAI" />
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                                 <outcome value='not-found'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '
-      + $db.vnf-related-network-role[0].related-network-role`" />
-                                                                        </set>
+                                                                    <block>
                                                                         <block atomic="true">
                                                                             <set>
                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1270,21 +890,13 @@
                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                             </set>
                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                <parameter name="input.response-code" value="500" />
-                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                            </configure>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                            </return>
                                                                         </block>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`'No l3-network returned from getNetworks custom query for related network role '
+      + $db.vnf-related-network-role[0].related-network-role`" />
+                                                                        </return>
                                                                     </block>
                                                                 </outcome>
                                                             </save>
@@ -1307,10 +919,7 @@
         pfx='aai.vlan-tag' local-only='false'
 >
                                                                                 <outcome value='failure'>
-                                                                                    <block atomic="true">
-                                                                                        <set>
-                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />
-                                                                                        </set>
+                                                                                    <block>
                                                                                         <block atomic="true">
                                                                                             <set>
                                                                                                 <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1318,21 +927,12 @@
                                                                                                 <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                                                             </set>
                                                                                             <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                                                            <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                                                                <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                                                                <parameter name="input.ack-final-indicator" value="Y" />
-                                                                                                <parameter name="input.response-code" value="500" />
-                                                                                                <parameter name="input.response-message" value="`$error-message`" />
-                                                                                                <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                                                                <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                                                                <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                                                            </configure>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`$error-message`" />
-                                                                                            </return>
                                                                                         </block>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="Error getting vlan-tag object from AAI" />
+                                                                                        </return>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='success'>
@@ -1384,11 +984,7 @@
                             <outcome value=''>
                                 <switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>
                                     <outcome value='true'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '
-       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1396,21 +992,13 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No availability zones found in AAI for cloud region '
+       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='false'>
@@ -1439,10 +1027,7 @@
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-key" value="availability-zone.availability-zone-name" />
                                     <parameter name="relationship-list.relationship[0].relationship-data[2].relationship-value" value="`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`" />
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1450,28 +1035,16 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1479,21 +1052,12 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1515,10 +1079,7 @@
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />
                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`" />
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1526,28 +1087,16 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error updating generic-vnf in AAI" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1555,21 +1104,12 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1601,10 +1141,7 @@
                             <parameter name="in-maint" value="true" />
                             <parameter name="selflink" value="`$vnf-object-path`" />
                             <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1612,28 +1149,16 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
                                     </block>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating selflink in generic-vnf in AAI" />
+                                    </return>
                                 </block>
                             </outcome>
                             <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                    </set>
+                                <block>
                                     <block atomic="true">
                                         <set>
                                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1641,21 +1166,12 @@
                                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                         </set>
                                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
                                     </block>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                    </return>
                                 </block>
                             </outcome>
                         </update>
@@ -1670,10 +1186,7 @@
       value="`'/aai/v$/network/instance-groups/instance-group/'
         + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`" />
                                     <outcome value='failure'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1681,28 +1194,16 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error updating relationship in generic-vnf in AAI" />
+                                            </return>
                                         </block>
                                     </outcome>
                                     <outcome value='not-found'>
-                                        <block atomic="true">
-                                            <set>
-                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
-                                            </set>
+                                        <block>
                                             <block atomic="true">
                                                 <set>
                                                     <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
@@ -1710,21 +1211,12 @@
                                                     <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
                                                 </set>
                                                 <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                                <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                                    <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                                    <parameter name="input.ack-final-indicator" value="Y" />
-                                                    <parameter name="input.response-code" value="500" />
-                                                    <parameter name="input.response-message" value="`$error-message`" />
-                                                    <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                    <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                                    <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                                </configure>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$error-message`" />
-                                                </return>
                                             </block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`" />
+                                            </return>
                                         </block>
                                     </outcome>
                                 </save>
@@ -1742,84 +1234,9 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />
                         </set>
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'vnf-data-assign.json'`" />
-                            <parameter name='restapiUrl' value="`$prop.controller.url + $tmp.vnf.url`" />
-                            <parameter name='restapiUser' value='`$prop.controller.user`' />
-                            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                            <parameter name='format' value='json' />
-                            <parameter name='httpMethod' value='PUT' />
-                            <parameter name="responsePrefix" value="vnf-assign" />
-                            <outcome value='failure'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vnf-data" />
-                                    </set>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                        </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic="true">
-                                    <set>
-                                        <parameter name="error-message" value="Error doing PUT of vnf-data" />
-                                    </set>
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                                        </set>
-                                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                                            <parameter name="input.ack-final-indicator" value="Y" />
-                                            <parameter name="input.response-code" value="500" />
-                                            <parameter name="input.response-message" value="`$error-message`" />
-                                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                                        </configure>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`$error-message`" />
-                                        </return>
-                                    </block>
-                                </block>
-                            </outcome>
-                        </execute>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                             <parameter name='filename' value='/var/tmp/bgb-vnf.log' />
                         </execute>
-                        <configure activate="true" adaptor="com.att.sdnctl.sli.adaptor.mso.MSOAdaptor" key="__READ_FROM_PARAMETERS__">
-                            <parameter name="notification-url" value="`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`" />
-                            <parameter name="input.ack-final-indicator" value="Y" />
-                            <parameter name="input.response-code" value="200" />
-                            <parameter name="input.svc-request-id" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                            <parameter name="input.service-information.service-type" value="`$vnf-topology-operation-input.service-information.subscription-service-type`" />
-                            <parameter name="input.service-information.service-instance-id" value="`$vnf-topology-operation-input.service-information.service-instance-id`" />
-                        </configure>
                         <return status='success'>
                             <parameter name="ack-final-indicator" value="Y" />
                             <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
deleted file mode 100644
index 69175f2f..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-async.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='vnf-topology-operation-async' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='skip-mdsal-update' value='Y' />
-            </set>
-            <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
-                <outcome value='assign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
-                </outcome>
-                <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
-                    </return>
-                </outcome>
-            </switch>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
-\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index ecee104f..cabcce51 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -6,14 +6,7 @@
             <call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' ></call>
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='skip-mdsal-update' value='Y' />
-                        </set>
-                        <set>
-                            <parameter name='ack-final' value='N' />
-                        </set>
-                    </block>
+                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
                 </outcome>
                 <outcome value='activate'>
                     <block atomic="true">
author	Timoney, Dan (dt5972) <dtimoney@att.com>	2019-08-27 09:53:59 -0400
committer	Timoney, Dan (dt5972) <dtimoney@att.com>	2019-08-27 09:54:57 -0400
commit	8e136272ffd5555c66ac4b8b6310eb974ca86e19 (patch)
tree	d1568a4af32ee767b06371c6aad1dab55906ccd1 /platform-logic/generic-resource-api
parent	c69e8ece5071de0ab4d029f64303a2591e8bb1ed (diff)