X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.json;h=089e74a336bcd581b72a32abd24d235ddb8e2fe6;hp=3d4b8bdc62422fbc21e3480065093f4fc492d7f6;hb=refs%2Fheads%2Fmaster;hpb=fbf997335b6cca38872e855ca168f20b18b286f5

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.json
index 3d4b8bdc..089e74a3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "47ef00b1.749c8",
+        "id": "5fef1ca7.f76b2c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 195,
-        "y": 102.5242919921875,
-        "z": "34265cd.7205424",
+        "x": 157.99998474121094,
+        "y": 199.52428817749023,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4efb4066.e4139"
+                "eadd48a2.a47be"
             ]
         ]
     },
     {
-        "id": "4efb4066.e4139",
+        "id": "eadd48a2.a47be",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,7265 +22,7309 @@
         "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": 308.8571357727051,
-        "y": 142.33382987976074,
-        "z": "34265cd.7205424",
+        "x": 271.857120513916,
+        "y": 239.33382606506348,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3089d18d.9d8e36"
+                "62584ce7.0a03c4"
             ]
         ]
     },
     {
-        "id": "3089d18d.9d8e36",
+        "id": "62584ce7.0a03c4",
         "type": "method",
         "name": "method vf-module-topology-operation-assign-async",
         "xml": "<method rpc='vf-module-topology-operation-assign-async' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 308.42862701416016,
-        "y": 182.5242919921875,
-        "z": "34265cd.7205424",
+        "x": 271.4286117553711,
+        "y": 279.52428817749023,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "effbab1c.8eeb18"
+                "f8ca447b.c9d998"
             ]
         ]
     },
     {
-        "id": "ddba88b.d2daa78",
+        "id": "2675f20c.3ef7c6",
         "type": "comment",
         "name": "vf-module-topology-operation-assign-async",
         "info": "",
         "comments": "",
-        "x": 549.0711059570312,
-        "y": 21,
-        "z": "34265cd.7205424",
+        "x": 512.0710906982422,
+        "y": 117.99999618530273,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "13d1edde.2c3cc2",
+        "id": "16a1cdd5.b488f2",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 600.1905212402344,
-        "y": 455.5480899810791,
-        "z": "34265cd.7205424",
+        "x": 563.1905059814453,
+        "y": 552.5480861663818,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d09a1f6d.c339a8",
-                "ae721e71.bc28f8"
+                "f6d2c005.1732a",
+                "cd49e654.ecead"
             ]
         ]
     },
     {
-        "id": "d09a1f6d.c339a8",
+        "id": "f6d2c005.1732a",
         "type": "outcome",
         "name": "CreateVfModuleInstance",
         "xml": "<outcome value='CreateVfModuleInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 870.9881591796875,
-        "y": 423.9409656524658,
-        "z": "34265cd.7205424",
+        "x": 833.9881439208984,
+        "y": 520.9409618377686,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "163e3c12.686c64"
+                "eda2626e.eabf58"
             ]
         ]
     },
     {
-        "id": "ae721e71.bc28f8",
+        "id": "cd49e654.ecead",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 805.9047813415527,
-        "y": 488.0719690322876,
-        "z": "34265cd.7205424",
+        "x": 768.9047660827637,
+        "y": 585.0719652175903,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b097fd2d.1c3e2"
+                "bdff604f.42ef3"
             ]
         ]
     },
     {
-        "id": "163e3c12.686c64",
+        "id": "eda2626e.eabf58",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1060.845323562622,
-        "y": 423.94099712371826,
-        "z": "34265cd.7205424",
+        "x": 1023.845308303833,
+        "y": 520.940993309021,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "356786ed.1c1db2",
+        "id": "d8c6245c.30876",
         "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": 647.5237884521484,
-        "y": 556.6910438537598,
-        "z": "34265cd.7205424",
+        "x": 610.5237731933594,
+        "y": 653.6910400390625,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3e27e49d.23f3f4",
-                "80af5787.882358"
+                "9743eae8.547b58",
+                "e217d566.35e7b"
             ]
         ]
     },
     {
-        "id": "3e27e49d.23f3f4",
+        "id": "9743eae8.547b58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 913.3094787597656,
-        "y": 537.0718746185303,
-        "z": "34265cd.7205424",
+        "x": 876.3094635009766,
+        "y": 634.071870803833,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2b23f970.b0e516"
+                "a8481a22.9610b"
             ]
         ]
     },
     {
-        "id": "80af5787.882358",
+        "id": "e217d566.35e7b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 921.8809089660645,
-        "y": 581.357587814331,
-        "z": "34265cd.7205424",
+        "x": 884.8808937072754,
+        "y": 678.3575839996338,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "19ca61b5.8fa5c6"
+                "12fc934c.3bd04d"
             ]
         ]
     },
     {
-        "id": "f269ddb2.03ac18",
+        "id": "9f361c75.f7c698",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 641.3690414428711,
-        "y": 734.0124034881592,
-        "z": "34265cd.7205424",
+        "x": 604.369026184082,
+        "y": 831.0123996734619,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b91f6edf.e66fa",
-                "de858ec5.7b807"
+                "496e5a5a.75943c",
+                "5e2df781.3cbcc8"
             ]
         ]
     },
     {
-        "id": "b91f6edf.e66fa",
+        "id": "496e5a5a.75943c",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 882.0833129882812,
-        "y": 710.155143737793,
-        "z": "34265cd.7205424",
+        "x": 845.0832977294922,
+        "y": 807.1551399230957,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "57fdbbee.7122f4"
+                "b40ea227.e7972"
             ]
         ]
     },
     {
-        "id": "de858ec5.7b807",
+        "id": "5e2df781.3cbcc8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 881.8451538085938,
-        "y": 752.1076622009277,
-        "z": "34265cd.7205424",
+        "x": 844.8451385498047,
+        "y": 849.1076583862305,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b90f80a9.a4803"
+                "159bdfa5.c6b9b8"
             ]
         ]
     },
     {
-        "id": "b2cbded2.837b2",
+        "id": "b209b55a.0520c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 239.9404296875,
-        "y": 3171.9293028116226,
-        "z": "34265cd.7205424",
-        "wires": [
-            [
-                "a43d883.25c17f8",
-                "a0b91b46.4fb248",
-                "cb9c99a0.7906c",
-                "734ae3c5.175e1c",
-                "d02c5f14.3d4ee",
-                "97b7d623.89325",
-                "925699fb.c3532",
-                "500b7c10.330fb4",
-                "e5d088d4.d1279",
-                "9f6faea5.1876d",
-                "b6b2184e.def9e",
-                "6c341ffe.ffd948",
-                "602e0129.20af78",
-                "f312e38d.47c19",
-                "c5f1094.89d7678",
-                "bdd166c5.9655d",
-                "3326bf0a.c858a",
-                "eada7f38.32c088",
-                "8aa4893.5435478",
-                "40d2ead1.29e2d4",
-                "205882d9.0b5ba6",
-                "e9f0935c.0d26e",
-                "cf288013.27e988",
-                "50d2cea2.bb528",
-                "886b51f6.cb8c8",
-                "14aa8b5.d6278f5",
-                "4b70bca8.2d04e4",
-                "d4b60897.e18598",
-                "fcdfebce.a935a8",
-                "84fdd3bf.927fd",
-                "9f112544.7f8a58",
-                "5b817e7f.0206",
-                "a1c5d05.89a983",
-                "7e168e6e.8d02f8",
-                "c1894905.cb3d58",
-                "7badb381.1fbf0c",
-                "2d6c7dfc.640b9a"
-            ]
-        ]
-    },
-    {
-        "id": "b90f80a9.a4803",
+        "x": 202.94041442871094,
+        "y": 3268.9292989969254,
+        "z": "1e5d41b0.b1168e",
+        "wires": [
+            [
+                "d765e32e.c6a6c8",
+                "e1aa9962.b2cca8",
+                "2886552.ce6422a",
+                "259e2808.48083",
+                "7ffcda81.e6c1cc",
+                "4ffa8fa2.c8758",
+                "a7369062.c567c8",
+                "69d66ce3.f97a5c",
+                "2cd2be99.205622",
+                "be3b3ee.7ce42c",
+                "c19d4ee0.8d77c",
+                "bd5d1959.e5b588",
+                "353f71d8.b849ee",
+                "10740584.685552",
+                "8266f367.7a81d",
+                "d570eb5d.f5786",
+                "f7a15e8.e9d50a",
+                "d0512da2.27542",
+                "1b32685d.a9d2f",
+                "5d0d3a4f.87fd84",
+                "33a320c6.b50498",
+                "13308bfd.0f2aec",
+                "a75def4f.6ee6e",
+                "43e6fb56.3aad2c",
+                "8ddb6fb6.8a0038",
+                "76eaad0d.045934",
+                "b55fea55.8a7208",
+                "f0a7970e.17889",
+                "52376e41.5c3c28",
+                "54266176.fdc52",
+                "ebdeb223.d9f918",
+                "db29530f.c21f7",
+                "2f669bfa.b0d904",
+                "d6e0298e.3c1e8",
+                "d3460755.d852e",
+                "d35134f0.fec4d",
+                "7916d324.cb3bf4"
+            ]
+        ]
+    },
+    {
+        "id": "159bdfa5.c6b9b8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1044.0832977294922,
-        "y": 751.7742805480957,
-        "z": "34265cd.7205424",
+        "x": 1007.0832824707031,
+        "y": 848.7742767333984,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f126a52f.3ffd6"
+                "d54b095a.77a938"
             ]
         ]
     },
     {
-        "id": "f126a52f.3ffd6",
+        "id": "d54b095a.77a938",
         "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": 1295.4165954589844,
-        "y": 751.4410085678101,
-        "z": "34265cd.7205424",
+        "x": 1258.4165802001953,
+        "y": 848.4410047531128,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "9db43827.db871"
+                "9291a4b4.435ba8"
             ]
         ]
     },
     {
-        "id": "9db43827.db871",
+        "id": "9291a4b4.435ba8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.4166069030762,
-        "y": 750.7743215560913,
-        "z": "34265cd.7205424",
+        "x": 1488.416591644287,
+        "y": 847.774317741394,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c01d11b0.35cf18"
+                "a2b9ec94.73978"
             ]
         ]
     },
     {
-        "id": "527b3c86.073724",
+        "id": "3ad4001f.cd4388",
         "type": "set",
         "name": "set vnf-index to -1",
         "xml": "<set>\n<parameter name='vnf-index' value='-1' />\n",
         "comments": "",
-        "x": 590.4166641235352,
-        "y": 665.4409027099609,
-        "z": "34265cd.7205424",
+        "x": 553.4166488647461,
+        "y": 762.4408988952637,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "c592a9bb.2acb88",
+        "id": "ffe8620d.4a41a8",
         "type": "set",
         "name": "set vnf-index to idx",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1847.0832443237305,
-        "y": 721.7742795944214,
-        "z": "34265cd.7205424",
+        "x": 1810.0832290649414,
+        "y": 818.7742757797241,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "aca51e3b.78a188",
+        "id": "b1d0605e.841ca",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 579.1666870117188,
-        "y": 817.6075925827026,
-        "z": "34265cd.7205424",
+        "x": 542.1666717529297,
+        "y": 914.6075887680054,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "cb668766.b21a98"
+                "b932b709.8abbb8"
             ]
         ]
     },
     {
-        "id": "cb668766.b21a98",
+        "id": "b932b709.8abbb8",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 757.500072479248,
-        "y": 816.9409685134888,
-        "z": "34265cd.7205424",
+        "x": 720.500057220459,
+        "y": 913.9409646987915,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a0d2ddbe.4ce55"
+                "5cd79a68.a802ec"
             ]
         ]
     },
     {
-        "id": "a43d883.25c17f8",
+        "id": "d765e32e.c6a6c8",
         "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": 617.0833854675293,
-        "y": 1388.3577966690063,
-        "z": "34265cd.7205424",
+        "x": 580.0833702087402,
+        "y": 1485.357792854309,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8981146c.cb942",
-                "fcfff00d.49938"
+                "996a7f9b.32041",
+                "904da051.0d0538"
             ]
         ]
     },
     {
-        "id": "8981146c.cb942",
+        "id": "996a7f9b.32041",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 874.4643402099609,
-        "y": 1355.5005702972412,
-        "z": "34265cd.7205424",
+        "x": 837.4643249511719,
+        "y": 1452.500566482544,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3dbed402.1d6ef4"
+                "4c326b2e.0b59a4"
             ]
         ]
     },
     {
-        "id": "3dbed402.1d6ef4",
+        "id": "4c326b2e.0b59a4",
         "type": "set",
         "name": "set vf-module-index=0",
         "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",
         "comments": "",
-        "x": 1062.0833778381348,
-        "y": 1356.167345046997,
-        "z": "34265cd.7205424",
+        "x": 1025.0833625793457,
+        "y": 1453.1673412322998,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "fcfff00d.49938",
+        "id": "904da051.0d0538",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 874.8928833007812,
-        "y": 1419.786428451538,
-        "z": "34265cd.7205424",
+        "x": 837.8928680419922,
+        "y": 1516.7864246368408,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7565eb2b.4c1ff4"
+                "ba1e98fd.f5e98"
             ]
         ]
     },
     {
-        "id": "c0b8cef7.d83a68",
+        "id": "ee38f883.9fd87",
         "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": 1260.083423614502,
-        "y": 1399.9768238067627,
-        "z": "34265cd.7205424",
+        "x": 1223.083408355713,
+        "y": 1496.9768199920654,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "baf65dc8.0e8fb8",
+        "id": "e6d36a66.fc6eb",
         "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": 1219.1785163879395,
-        "y": 1444.0720539093018,
-        "z": "34265cd.7205424",
+        "x": 1182.1785011291504,
+        "y": 1541.0720500946045,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c8acfe74.080af8"
+                "2fd1f627.c02a4a"
             ]
         ]
     },
     {
-        "id": "7565eb2b.4c1ff4",
+        "id": "ba1e98fd.f5e98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1011.6071624755859,
-        "y": 1419.7863540649414,
-        "z": "34265cd.7205424",
+        "x": 974.6071472167969,
+        "y": 1516.7863502502441,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c0b8cef7.d83a68",
-                "baf65dc8.0e8fb8"
+                "ee38f883.9fd87",
+                "e6d36a66.fc6eb"
             ]
         ]
     },
     {
-        "id": "c8acfe74.080af8",
+        "id": "2fd1f627.c02a4a",
         "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": 1722.7976188659668,
-        "y": 1443.6434650421143,
-        "z": "34265cd.7205424",
+        "x": 1685.7976036071777,
+        "y": 1540.643461227417,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e7c1d7a5.ea41f"
+                "f6ad1e0e.9e6058"
             ]
         ]
     },
     {
-        "id": "e7c1d7a5.ea41f",
+        "id": "f6ad1e0e.9e6058",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2165.4166679382324,
-        "y": 1443.214916229248,
-        "z": "34265cd.7205424",
+        "x": 2128.4166526794434,
+        "y": 1540.2149124145508,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bdb7e590.4bbf98"
+                "2a30af16.7b82"
             ]
         ]
     },
     {
-        "id": "d2392dfe.c660f",
+        "id": "d15dcaa9.4347a8",
         "type": "comment",
         "name": "make sure this VF module doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1749.2499656677246,
-        "y": 1398.270956993103,
-        "z": "34265cd.7205424",
+        "x": 1712.2499504089355,
+        "y": 1495.2709531784058,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "a0b91b46.4fb248",
+        "id": "e1aa9962.b2cca8",
         "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": 627.7499656677246,
-        "y": 1499.3576517105103,
-        "z": "34265cd.7205424",
+        "x": 590.7499504089355,
+        "y": 1596.357647895813,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "cb9c99a0.7906c",
+        "id": "2886552.ce6422a",
         "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": 634.2499847412109,
-        "y": 1611.8577585220337,
-        "z": "34265cd.7205424",
+        "x": 597.2499694824219,
+        "y": 1708.8577547073364,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ee8323c4.89df98",
+        "id": "6e9378a9.0367d",
         "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": 1395.2022438049316,
-        "y": 1771.095685005188,
-        "z": "34265cd.7205424",
+        "x": 1358.2022285461426,
+        "y": 1868.0956811904907,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "734ae3c5.175e1c",
+        "id": "259e2808.48083",
         "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": 594.2499046325684,
-        "y": 1885.0480251312256,
-        "z": "34265cd.7205424",
+        "x": 557.2498893737793,
+        "y": 1982.0480213165283,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a5088391.cb913"
+                "9ac40770.7714b"
             ]
         ]
     },
     {
-        "id": "a5088391.cb913",
+        "id": "9ac40770.7714b",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 739.5355949401855,
-        "y": 1885.0480937957764,
-        "z": "34265cd.7205424",
+        "x": 702.5355796813965,
+        "y": 1982.048089981079,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2b8167ac.ee8e3"
+                "42e790a.f88747"
             ]
         ]
     },
     {
-        "id": "d02c5f14.3d4ee",
+        "id": "7ffcda81.e6c1cc",
         "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": 633.107120513916,
-        "y": 1685.1912965774536,
-        "z": "34265cd.7205424",
+        "x": 596.107105255127,
+        "y": 1782.1912927627563,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "afc6e33.fafafa",
-                "60ebcdb7.264a0c"
+                "f2beec5b.5611a8",
+                "30b937c5.93fd7"
             ]
         ]
     },
     {
-        "id": "60ebcdb7.264a0c",
+        "id": "30b937c5.93fd7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 847.3533134460449,
-        "y": 1703.34215259552,
-        "z": "34265cd.7205424",
+        "x": 810.3532981872559,
+        "y": 1800.3421487808228,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "71cefe31.79b508"
+                "caeb64b7.ba2878"
             ]
         ]
     },
     {
-        "id": "afc6e33.fafafa",
+        "id": "f2beec5b.5611a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 856.281909942627,
-        "y": 1660.6278858184814,
-        "z": "34265cd.7205424",
+        "x": 819.2818946838379,
+        "y": 1757.6278820037842,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e750571d.ca626"
+                "7e580eff.038e2"
             ]
         ]
     },
     {
-        "id": "c01d11b0.35cf18",
+        "id": "a2b9ec94.73978",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1673.7500686645508,
-        "y": 749.6940202713013,
-        "z": "34265cd.7205424",
+        "x": 1636.7500534057617,
+        "y": 846.694016456604,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c592a9bb.2acb88",
-                "9ce31ee0.52ab58"
+                "ffe8620d.4a41a8",
+                "4b03173.9ac0e68"
             ]
         ]
     },
     {
-        "id": "9ce31ee0.52ab58",
+        "id": "4b03173.9ac0e68",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1808.7500343322754,
-        "y": 771.3606061935425,
-        "z": "34265cd.7205424",
+        "x": 1771.7500190734863,
+        "y": 868.3606023788452,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "c55eb946.3ed8e8",
+        "id": "fc19e6e.2a84698",
         "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": 1008.5832443237305,
-        "y": 1926.4440183639526,
-        "z": "34265cd.7205424",
+        "x": 971.5832290649414,
+        "y": 2023.4440145492554,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "97b7d623.89325",
+        "id": "4ffa8fa2.c8758",
         "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": 652.4403190612793,
-        "y": 1949.2684621810913,
-        "z": "34265cd.7205424",
+        "x": 615.4403038024902,
+        "y": 2046.268458366394,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ef2c9ecf.3ea71",
-                "6560f94f.b870d8"
+                "8859fea1.da3998",
+                "69b411af.327d08"
             ]
         ]
     },
     {
-        "id": "ef2c9ecf.3ea71",
+        "id": "8859fea1.da3998",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 858.106990814209,
-        "y": 1926.4114255905151,
-        "z": "34265cd.7205424",
+        "x": 821.1069755554199,
+        "y": 2023.4114217758179,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c55eb946.3ed8e8"
+                "fc19e6e.2a84698"
             ]
         ]
     },
     {
-        "id": "6560f94f.b870d8",
+        "id": "69b411af.327d08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 859.535587310791,
-        "y": 1970.6970167160034,
-        "z": "34265cd.7205424",
+        "x": 822.535572052002,
+        "y": 2067.697012901306,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3ee20fc0.bf22f"
+                "d1ad172f.1fe558"
             ]
         ]
     },
     {
-        "id": "3ee20fc0.bf22f",
+        "id": "d1ad172f.1fe558",
         "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": 1013.8213233947754,
-        "y": 1970.1255888938904,
-        "z": "34265cd.7205424",
+        "x": 976.8213081359863,
+        "y": 2067.125585079193,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "3108a061.0ec8f",
+        "id": "ff8a2c9.6d54b5",
         "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": 1009.535514831543,
-        "y": 2014.9826946258545,
-        "z": "34265cd.7205424",
+        "x": 972.5354995727539,
+        "y": 2111.982690811157,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "925699fb.c3532",
+        "id": "a7369062.c567c8",
         "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": 625.0593376159668,
-        "y": 2037.8071994781494,
-        "z": "34265cd.7205424",
+        "x": 588.0593223571777,
+        "y": 2134.807195663452,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "935ab6e4.246cd",
-                "110bf82.0172d08"
+                "2621938b.96a034",
+                "cc168f45.9ae8f8"
             ]
         ]
     },
     {
-        "id": "935ab6e4.246cd",
+        "id": "2621938b.96a034",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 859.0593109130859,
-        "y": 2014.9501314163208,
-        "z": "34265cd.7205424",
+        "x": 822.0592956542969,
+        "y": 2111.9501276016235,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3108a061.0ec8f"
+                "ff8a2c9.6d54b5"
             ]
         ]
     },
     {
-        "id": "110bf82.0172d08",
+        "id": "cc168f45.9ae8f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 860.487907409668,
-        "y": 2059.235722541809,
-        "z": "34265cd.7205424",
+        "x": 823.4878921508789,
+        "y": 2156.235718727112,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f5fdcdbb.a51fc8"
+                "6b2c4cda.703a54"
             ]
         ]
     },
     {
-        "id": "f5fdcdbb.a51fc8",
+        "id": "6b2c4cda.703a54",
         "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": 1014.7736434936523,
-        "y": 2058.664294719696,
-        "z": "34265cd.7205424",
+        "x": 977.7736282348633,
+        "y": 2155.664290904999,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "3414be68.250f22",
+        "id": "40fb71b4.fe9a88",
         "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": 1006.6784477233887,
-        "y": 2103.8399019241333,
-        "z": "34265cd.7205424",
+        "x": 969.6784324645996,
+        "y": 2200.839898109436,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "500b7c10.330fb4",
+        "id": "69d66ce3.f97a5c",
         "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": 633.2022094726562,
-        "y": 2126.6643466949463,
-        "z": "34265cd.7205424",
+        "x": 596.2021942138672,
+        "y": 2223.664342880249,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2d96bcee.a98f2c",
-                "d50c8bc4.769118"
+                "8d1bc34b.5f2768",
+                "b5cb1b08.e5fea8"
             ]
         ]
     },
     {
-        "id": "2d96bcee.a98f2c",
+        "id": "8d1bc34b.5f2768",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 856.2021942138672,
-        "y": 2103.807309150696,
-        "z": "34265cd.7205424",
+        "x": 819.2021789550781,
+        "y": 2200.8073053359985,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3414be68.250f22"
+                "40fb71b4.fe9a88"
             ]
         ]
     },
     {
-        "id": "d50c8bc4.769118",
+        "id": "b5cb1b08.e5fea8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 857.6307907104492,
-        "y": 2148.092900276184,
-        "z": "34265cd.7205424",
+        "x": 820.6307754516602,
+        "y": 2245.092896461487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f4ecdb0.7ccf3a8"
+                "91462cbf.dd094"
             ]
         ]
     },
     {
-        "id": "f4ecdb0.7ccf3a8",
+        "id": "91462cbf.dd094",
         "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": 1011.9165267944336,
-        "y": 2147.521472454071,
-        "z": "34265cd.7205424",
+        "x": 974.9165115356445,
+        "y": 2244.521468639374,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "1c1e9347.9ae5dd",
+        "id": "5d0993e7.17439c",
         "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": 1006.6784477233887,
-        "y": 2190.9827241897583,
-        "z": "34265cd.7205424",
+        "x": 969.6784324645996,
+        "y": 2287.982720375061,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "e5d088d4.d1279",
+        "id": "2cd2be99.205622",
         "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": 628.2022094726562,
-        "y": 2213.8071689605713,
-        "z": "34265cd.7205424",
+        "x": 591.2021942138672,
+        "y": 2310.807165145874,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f63d99eb.7ea558",
-                "a3370d33.87d5d"
+                "be5907cf.3853a",
+                "c1f83a69.57a51"
             ]
         ]
     },
     {
-        "id": "f63d99eb.7ea558",
+        "id": "be5907cf.3853a",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 856.2021942138672,
-        "y": 2190.950131416321,
-        "z": "34265cd.7205424",
+        "x": 819.2021789550781,
+        "y": 2287.9501276016235,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1c1e9347.9ae5dd"
+                "5d0993e7.17439c"
             ]
         ]
     },
     {
-        "id": "a3370d33.87d5d",
+        "id": "c1f83a69.57a51",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 857.6307907104492,
-        "y": 2235.235722541809,
-        "z": "34265cd.7205424",
+        "x": 820.6307754516602,
+        "y": 2332.235718727112,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b62b5297.640c38"
+                "19c39c5d.580394"
             ]
         ]
     },
     {
-        "id": "b62b5297.640c38",
+        "id": "19c39c5d.580394",
         "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": 1011.9165267944336,
-        "y": 2234.664294719696,
-        "z": "34265cd.7205424",
+        "x": 974.9165115356445,
+        "y": 2331.664290904999,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "9f6faea5.1876d",
+        "id": "be3b3ee.7ce42c",
         "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": 642.6545448303223,
-        "y": 2286.3161582946777,
-        "z": "34265cd.7205424",
+        "x": 605.6545295715332,
+        "y": 2383.3161544799805,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "b6b2184e.def9e",
+        "id": "c19d4ee0.8d77c",
         "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": 595.8451919555664,
-        "y": 1555.0393342971802,
-        "z": "34265cd.7205424",
+        "x": 558.8451766967773,
+        "y": 1652.039330482483,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "6c341ffe.ffd948",
+        "id": "bd5d1959.e5b588",
         "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": 655.3609352111816,
-        "y": 1773.697979927063,
-        "z": "34265cd.7205424",
+        "x": 618.3609199523926,
+        "y": 1870.6979761123657,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c0518e57.620ee8"
+                "de08cd4.005073"
             ]
         ]
     },
     {
-        "id": "c0518e57.620ee8",
+        "id": "de08cd4.005073",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 903.039478302002,
-        "y": 1773.4479093551636,
-        "z": "34265cd.7205424",
+        "x": 866.0394630432129,
+        "y": 1870.4479055404663,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "541c6720.7cffe8"
+                "fd795205.2ddc38"
             ]
         ]
     },
     {
-        "id": "541c6720.7cffe8",
+        "id": "fd795205.2ddc38",
         "type": "outcome",
         "name": "complex",
         "xml": "<outcome value='complex'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1072.5037994384766,
-        "y": 1772.8407316207886,
-        "z": "34265cd.7205424",
+        "x": 1035.5037841796875,
+        "y": 1869.8407278060913,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "de4075f3.bc9ec"
+                "87c9d5a3.8ba4f"
             ]
         ]
     },
     {
-        "id": "bfd35321.fbdcc",
+        "id": "893bbd1e.4638",
         "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": 1412.5989570617676,
-        "y": 1727.2693071365356,
-        "z": "34265cd.7205424",
+        "x": 1375.5989418029785,
+        "y": 1824.2693033218384,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "de4075f3.bc9ec",
+        "id": "87c9d5a3.8ba4f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1232.2656593322754,
-        "y": 1773.936095237732,
-        "z": "34265cd.7205424",
+        "x": 1195.2656440734863,
+        "y": 1870.9360914230347,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bfd35321.fbdcc",
-                "b03a09c0.4474b8",
-                "ee8323c4.89df98"
+                "893bbd1e.4638",
+                "6e705361.dc7ec4",
+                "6e9378a9.0367d"
             ]
         ]
     },
     {
-        "id": "b03a09c0.4474b8",
+        "id": "6e705361.dc7ec4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1382.2656211853027,
-        "y": 1817.2693920135498,
-        "z": "34265cd.7205424",
+        "x": 1345.2656059265137,
+        "y": 1914.2693881988525,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "d583179d.999f08",
+        "id": "ba0281e8.c6d89",
         "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": 614.0476226806641,
-        "y": 212.04809951782227,
-        "z": "34265cd.7205424",
+        "x": 608.047607421875,
+        "y": 270.048095703125,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8aa4893.5435478",
+        "id": "1b32685d.a9d2f",
         "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": 540.5122909545898,
-        "y": 7382.904582977295,
-        "z": "34265cd.7205424",
+        "x": 503.5122756958008,
+        "y": 7479.904579162598,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "40d2ead1.29e2d4",
+        "id": "5d0d3a4f.87fd84",
         "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": 484.01214599609375,
-        "y": 8147.951934337616,
-        "z": "34265cd.7205424",
+        "x": 447.0121307373047,
+        "y": 8244.951930522919,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "eada7f38.32c088",
+        "id": "d0512da2.27542",
         "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": 472.6192321777344,
-        "y": 7239.253315925598,
-        "z": "34265cd.7205424",
+        "x": 435.6192169189453,
+        "y": 7336.253312110901,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "3326bf0a.c858a",
+        "id": "f7a15e8.e9d50a",
         "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": 527.5002517700195,
-        "y": 7186.038250923157,
-        "z": "34265cd.7205424",
+        "x": 490.50023651123047,
+        "y": 7283.0382471084595,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "f312e38d.47c19",
+        "id": "10740584.685552",
         "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": 557.8929710388184,
-        "y": 4393.039915680885,
-        "z": "34265cd.7205424",
+        "x": 520.8929557800293,
+        "y": 4490.039911866188,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "56183cf7.21f8bc",
-                "298fb653.de04f2"
+                "ebdaa7ec.bf551",
+                "1b4621ea.e2df9e"
             ]
         ]
     },
     {
-        "id": "56183cf7.21f8bc",
+        "id": "ebdaa7ec.bf551",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 732.9646110534668,
-        "y": 4361.4205375909805,
-        "z": "34265cd.7205424",
+        "x": 695.9645957946777,
+        "y": 4458.420533776283,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "69c206e5.9c5be8"
+                "5962f380.97801c"
             ]
         ]
     },
     {
-        "id": "298fb653.de04f2",
+        "id": "1b4621ea.e2df9e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 741.5359840393066,
-        "y": 4430.039627611637,
-        "z": "34265cd.7205424",
+        "x": 704.5359687805176,
+        "y": 4527.03962379694,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ca232fc7.373f28"
+                "a583af75.4a7c"
             ]
         ]
     },
     {
-        "id": "602e0129.20af78",
+        "id": "353f71d8.b849ee",
         "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": 581.5597801208496,
-        "y": 4268.564144730568,
-        "z": "34265cd.7205424",
+        "x": 544.5597648620605,
+        "y": 4365.564140915871,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "8b5e2bc.0d8cdd8",
+        "id": "a523e3d.fb4e3a",
         "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": 1351.5835266113281,
-        "y": 5951.192310094833,
-        "z": "34265cd.7205424",
+        "x": 1314.583511352539,
+        "y": 6048.192306280136,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "156220b0.97881f",
-                "a8f671db.55245"
+                "194c928.6ab7c6e",
+                "d8ed4d46.8d3988"
             ]
         ]
     },
     {
-        "id": "156220b0.97881f",
+        "id": "194c928.6ab7c6e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1571.4168701171875,
-        "y": 5922.064054250717,
-        "z": "34265cd.7205424",
+        "x": 1534.4168548583984,
+        "y": 6019.06405043602,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d0730d21.778c9"
+                "8b294cea.9128d8"
             ]
         ]
     },
     {
-        "id": "a8f671db.55245",
+        "id": "d8ed4d46.8d3988",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1579.9884033203125,
-        "y": 5974.683198690414,
-        "z": "34265cd.7205424",
+        "x": 1542.9883880615234,
+        "y": 6071.683194875717,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e6565cbf.f37f88"
+                "3015a60e.8d9b02"
             ]
         ]
     },
     {
-        "id": "c5f1094.89d7678",
+        "id": "8266f367.7a81d",
         "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": 531.2502517700195,
-        "y": 5716.525862932205,
-        "z": "34265cd.7205424",
+        "x": 494.25023651123047,
+        "y": 5813.525859117508,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "900abd87.03036"
+                "ae746370.fbd12"
             ]
         ]
     },
     {
-        "id": "71e9d608.74954",
+        "id": "721dd7e.3003728",
         "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": 928.2502632141113,
-        "y": 6135.192695140839,
-        "z": "34265cd.7205424",
+        "x": 891.2502479553223,
+        "y": 6232.192691326141,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "474d2262.a76184"
+                "93d8dd9c.4ab7e8"
             ]
         ]
     },
     {
-        "id": "bdd166c5.9655d",
+        "id": "d570eb5d.f5786",
         "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": 476.92879486083984,
-        "y": 7081.0718812942505,
-        "z": "34265cd.7205424",
+        "x": 439.9287796020508,
+        "y": 7178.071877479553,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "5099fa11.6e8244"
+                "84f3bff5.a80988"
             ]
         ]
     },
     {
-        "id": "5099fa11.6e8244",
+        "id": "84f3bff5.a80988",
         "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": 671.928825378418,
-        "y": 7080.4048891067505,
-        "z": "34265cd.7205424",
+        "x": 634.9288101196289,
+        "y": 7177.404885292053,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "99b22585.2f4188"
+                "9db83f9.3bdd74"
             ]
         ]
     },
     {
-        "id": "70d018d1.df953",
+        "id": "1b0dcc5f.b77854",
         "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": 1092.3455200195312,
-        "y": 7105.5725764632225,
-        "z": "34265cd.7205424",
+        "x": 1055.3455047607422,
+        "y": 7202.572572648525,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ee6a30b6.2fdb08"
+                "42a14d7b.afe65c"
             ]
         ]
     },
     {
-        "id": "f7b025d1.119928",
+        "id": "8c3d549d.3f55c",
         "type": "comment",
         "name": "Not a failure",
         "info": "",
         "comments": "",
-        "x": 1612.3454208374023,
-        "y": 7105.572581231594,
-        "z": "34265cd.7205424",
+        "x": 1575.3454055786133,
+        "y": 7202.572577416897,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ee6a30b6.2fdb08",
+        "id": "42a14d7b.afe65c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302.3455047607422,
-        "y": 7105.57272619009,
-        "z": "34265cd.7205424",
+        "x": 1265.3454895019531,
+        "y": 7202.572722375393,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f00a7c73.128e3"
+                "697d9822.ab8678"
             ]
         ]
     },
     {
-        "id": "f00a7c73.128e3",
+        "id": "697d9822.ab8678",
         "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": 1445.6789474487305,
-        "y": 7105.572564065456,
-        "z": "34265cd.7205424",
+        "x": 1408.6789321899414,
+        "y": 7202.572560250759,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a9e98a28.a6413",
+        "id": "ebdc10bd.8a96c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1475.679069519043,
-        "y": 7056.904277741909,
-        "z": "34265cd.7205424",
+        "x": 1438.679054260254,
+        "y": 7153.904273927212,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f18e18b8.f1a978"
+                "46ad510d.4ec508"
             ]
         ]
     },
     {
-        "id": "f0f9c912.bbfa7",
+        "id": "9141cc56.5e1638",
         "type": "comment",
         "name": "Not a failure",
         "info": "",
         "comments": "",
-        "x": 1799.0121231079102,
-        "y": 7055.238099992275,
-        "z": "34265cd.7205424",
+        "x": 1762.012107849121,
+        "y": 7152.238096177578,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "f18e18b8.f1a978",
+        "id": "46ad510d.4ec508",
         "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": 1621.6790046691895,
-        "y": 7056.904910981655,
-        "z": "34265cd.7205424",
+        "x": 1584.6789894104004,
+        "y": 7153.904907166958,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "99b22585.2f4188",
+        "id": "9db83f9.3bdd74",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 840.2622184753418,
-        "y": 7079.404733657837,
-        "z": "34265cd.7205424",
+        "x": 803.2622032165527,
+        "y": 7176.40472984314,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "432a36c8.1b8a38",
-                "70d018d1.df953"
+                "48a8f335.b41d6c",
+                "1b0dcc5f.b77854"
             ]
         ]
     },
     {
-        "id": "432a36c8.1b8a38",
+        "id": "48a8f335.b41d6c",
         "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": 1182.3455352783203,
-        "y": 7057.238910615444,
-        "z": "34265cd.7205424",
+        "x": 1145.3455200195312,
+        "y": 7154.238906800747,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a9e98a28.a6413"
+                "ebdc10bd.8a96c8"
             ]
         ]
     },
     {
-        "id": "69c206e5.9c5be8",
+        "id": "5962f380.97801c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 891.2501792907715,
-        "y": 4361.191208481789,
-        "z": "34265cd.7205424",
+        "x": 854.2501640319824,
+        "y": 4458.191204667091,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "23db4204.137326",
-                "deea8b7a.34ee38"
+                "9929cc19.031428",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "ca232fc7.373f28",
+        "id": "a583af75.4a7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 892.2500953674316,
-        "y": 4427.857498705387,
-        "z": "34265cd.7205424",
+        "x": 855.2500801086426,
+        "y": 4524.85749489069,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c333832f.3cfc3"
+                "da0980a4.747a78"
             ]
         ]
     },
     {
-        "id": "d0730d21.778c9",
+        "id": "8b294cea.9128d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1739.9168739318848,
-        "y": 5921.858323812485,
-        "z": "34265cd.7205424",
+        "x": 1702.9168586730957,
+        "y": 6018.8583199977875,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c98dc3b.19af54",
-                "269063c8.ce5a84"
+                "bcecc401.bf37b",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "e6565cbf.f37f88",
+        "id": "3015a60e.8d9b02",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1734.9168739318848,
-        "y": 5974.8581664562225,
-        "z": "34265cd.7205424",
+        "x": 1697.9168586730957,
+        "y": 6071.858162641525,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "21dc9b2.c9b4164",
-                "269063c8.ce5a84"
+                "8ce17d26.7481f8",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "857ef89e.1a5408",
+        "id": "d8e05d0.e811aa",
         "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": 1100.833351135254,
-        "y": 2498.691061973572,
-        "z": "34265cd.7205424",
+        "x": 1063.8333358764648,
+        "y": 2595.6910581588745,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "416fdbec.15ba44",
-                "73c4e919.9f625"
+                "d9ea3efe.a87e5",
+                "e2faee57.b7f5d"
             ]
         ]
     },
     {
-        "id": "416fdbec.15ba44",
+        "id": "d9ea3efe.a87e5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1369.1665840148926,
-        "y": 2457.0243921279907,
-        "z": "34265cd.7205424",
+        "x": 1332.1665687561035,
+        "y": 2554.0243883132935,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1f482e71.6f90f2"
+                "88e9c571.834c18"
             ]
         ]
     },
     {
-        "id": "73c4e919.9f625",
+        "id": "e2faee57.b7f5d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1367.4999389648438,
-        "y": 2532.024540901184,
-        "z": "34265cd.7205424",
+        "x": 1330.4999237060547,
+        "y": 2629.024537086487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2b585b07.776fbc"
+                "8820c3b4.3dae5"
             ]
         ]
     },
     {
-        "id": "1f482e71.6f90f2",
+        "id": "88e9c571.834c18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1525.833339691162,
-        "y": 2455.3578300476074,
-        "z": "34265cd.7205424",
+        "x": 1488.833324432373,
+        "y": 2552.35782623291,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "875e55f0.b2f8e8"
+                "581ce945.29d908"
             ]
         ]
     },
     {
-        "id": "2b585b07.776fbc",
+        "id": "8820c3b4.3dae5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1522.4999465942383,
-        "y": 2532.0243825912476,
-        "z": "34265cd.7205424",
+        "x": 1485.4999313354492,
+        "y": 2629.0243787765503,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8bed185c.8ac5d"
+                "4e9d9449.fc591c"
             ]
         ]
     },
     {
-        "id": "875e55f0.b2f8e8",
+        "id": "581ce945.29d908",
         "type": "switchNode",
         "name": "switch mdsal-preload.response-code",
         "xml": "<switch test='`$mdsal-preload.response-code`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1754.1666412353516,
-        "y": 2455.357871055603,
-        "z": "34265cd.7205424",
+        "x": 1717.1666259765625,
+        "y": 2552.3578672409058,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d327b2a2.0c837",
-                "fd8f2e7a.c3fae"
+                "69e5b9e1.abe87",
+                "bafb2098.90126"
             ]
         ]
     },
     {
-        "id": "d327b2a2.0c837",
+        "id": "69e5b9e1.abe87",
         "type": "outcome",
         "name": "404 (not found)",
         "xml": "<outcome value='404'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2037.0833435058594,
-        "y": 2409.940915107727,
-        "z": "34265cd.7205424",
+        "x": 2000.0833282470703,
+        "y": 2506.94091129303,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "35aa0744.80b5c8"
+                "aeaac31c.b0a03"
             ]
         ]
     },
     {
-        "id": "35aa0744.80b5c8",
+        "id": "aeaac31c.b0a03",
         "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": 2439.99991607666,
-        "y": 2323.274383544922,
-        "z": "34265cd.7205424",
+        "x": 2402.999900817871,
+        "y": 2420.2743797302246,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "123078c4.5f42b7"
+                "f7ff06c4.ed826"
             ]
         ]
     },
     {
-        "id": "123078c4.5f42b7",
+        "id": "f7ff06c4.ed826",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2828.7498779296875,
-        "y": 2324.1082620620728,
-        "z": "34265cd.7205424",
+        "x": 2791.7498626708984,
+        "y": 2421.1082582473755,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b201b2ed.f32f68"
+                "8d60dce.3fe77a"
             ]
         ]
     },
     {
-        "id": "fd8f2e7a.c3fae",
+        "id": "bafb2098.90126",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2003.3333053588867,
-        "y": 2474.107699394226,
-        "z": "34265cd.7205424",
+        "x": 1966.3332901000977,
+        "y": 2571.107695579529,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "886e3c52.8c2238"
+                "59ff4e4b.8c6b68"
             ]
         ]
     },
     {
-        "id": "8bed185c.8ac5d",
+        "id": "4e9d9449.fc591c",
         "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": 1885.833236694336,
-        "y": 2533.6911306381226,
-        "z": "34265cd.7205424",
+        "x": 1848.8332214355469,
+        "y": 2630.6911268234253,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "470a9210.0d2c7c"
+                "e07b96b8.ec3848"
             ]
         ]
     },
     {
-        "id": "470a9210.0d2c7c",
+        "id": "e07b96b8.ec3848",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2241.500099182129,
-        "y": 2532.024748802185,
-        "z": "34265cd.7205424",
+        "x": 2204.50008392334,
+        "y": 2629.024744987488,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "9af3e55f.6087e"
+                "fddcb313.1cf958"
             ]
         ]
     },
     {
-        "id": "900abd87.03036",
+        "id": "ae746370.fbd12",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 721.7503204345703,
-        "y": 5717.3590977191925,
-        "z": "34265cd.7205424",
+        "x": 684.7503051757812,
+        "y": 5814.359093904495,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "71e9d608.74954",
-                "61dc9df3.118e34"
+                "721dd7e.3003728",
+                "b19496cb.88b488"
             ]
         ]
     },
     {
-        "id": "61dc9df3.118e34",
+        "id": "b19496cb.88b488",
         "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": 972.7503700256348,
-        "y": 4922.025188922882,
-        "z": "34265cd.7205424",
+        "x": 935.7503547668457,
+        "y": 5019.025185108185,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "933d597e.bd69e8"
+                "1e32842a.58b264"
             ]
         ]
     },
     {
-        "id": "c87af5c.2b49f88",
+        "id": "486da9cb.5e0db",
         "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": 1698.7504386901855,
-        "y": 4730.359119415283,
-        "z": "34265cd.7205424",
+        "x": 1661.7504234313965,
+        "y": 4827.359115600586,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d4c69512.b7a85",
-                "cb5ae333.4bb6c"
+                "ed23263a.02e4b",
+                "fd219437.f0a108"
             ]
         ]
     },
     {
-        "id": "933d597e.bd69e8",
+        "id": "1e32842a.58b264",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1141.0836715698242,
-        "y": 4922.692016124725,
-        "z": "34265cd.7205424",
+        "x": 1104.0836563110352,
+        "y": 5019.692012310028,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "90bbdc02.a17328",
-                "4f542d3d.52a65c",
-                "9ee6416c.5e5dc8",
-                "67190c0.7b4b2f4",
-                "2591369f.6e45f2",
-                "f5615f88.05ae28"
+                "c0e750b5.9c30a",
+                "92ab8c55.74cf88",
+                "1b5a92a6.166fdd",
+                "73fcbf14.3fdec",
+                "94b5136b.b8b098",
+                "c3cf109b.3ee48"
             ]
         ]
     },
     {
-        "id": "d4c69512.b7a85",
+        "id": "ed23263a.02e4b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1889.7504768371582,
-        "y": 4682.692453384399,
-        "z": "34265cd.7205424",
+        "x": 1852.7504615783691,
+        "y": 4779.692449569702,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fcab33e3.661e5"
+                "62a1d2ce.f5805c"
             ]
         ]
     },
     {
-        "id": "fcab33e3.661e5",
+        "id": "62a1d2ce.f5805c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2054.917163848877,
-        "y": 4696.820286691189,
-        "z": "34265cd.7205424",
+        "x": 2017.917148590088,
+        "y": 4793.820282876492,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "64b6a50b.0e40cc",
-                "deea8b7a.34ee38"
+                "ce58c07c.b817d",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "9ee6416c.5e5dc8",
+        "id": "1b5a92a6.166fdd",
         "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": 1365.654956817627,
-        "y": 4830.97835111618,
-        "z": "34265cd.7205424",
+        "x": 1328.654941558838,
+        "y": 4927.978347301483,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4aa5e996.c15df8",
-                "627ad9e4.060cf"
+                "55b62c68.acde94",
+                "e4bd7450.018bf"
             ]
         ]
     },
     {
-        "id": "b05f84b7.ac3f68",
+        "id": "21cae6a7.1f1552",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1697.4881477355957,
-        "y": 4804.2959752082825,
-        "z": "34265cd.7205424",
+        "x": 1660.4881324768066,
+        "y": 4901.295971393585,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ecec95d0.f03d18",
-                "deea8b7a.34ee38"
+                "8a14b675.cd4478",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "d68d461e.5265a",
+        "id": "32299384.140b94",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1697.488224029541,
-        "y": 4857.29573392868,
-        "z": "34265cd.7205424",
+        "x": 1660.488208770752,
+        "y": 4954.295730113983,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4b5a4f9a.72aaf8",
-                "deea8b7a.34ee38"
+                "b8157190.3209b8",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "4aa5e996.c15df8",
+        "id": "55b62c68.acde94",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1540.6550331115723,
-        "y": 4804.311645030975,
-        "z": "34265cd.7205424",
+        "x": 1503.6550178527832,
+        "y": 4901.311641216278,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b05f84b7.ac3f68"
+                "21cae6a7.1f1552"
             ]
         ]
     },
     {
-        "id": "627ad9e4.060cf",
+        "id": "e4bd7450.018bf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1549.2265663146973,
-        "y": 4856.930789470673,
-        "z": "34265cd.7205424",
+        "x": 1512.2265510559082,
+        "y": 4953.930785655975,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d68d461e.5265a"
+                "32299384.140b94"
             ]
         ]
     },
     {
-        "id": "90bbdc02.a17328",
+        "id": "c0e750b5.9c30a",
         "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": 1363.1310768127441,
-        "y": 5247.834759235382,
-        "z": "34265cd.7205424",
+        "x": 1326.131061553955,
+        "y": 5344.834755420685,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "58cb90bc.4bbef8"
+                "47726d30.d34cb4"
             ]
         ]
     },
     {
-        "id": "205882d9.0b5ba6",
+        "id": "33a320c6.b50498",
         "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": 583.7499809265137,
-        "y": 2555.7385811805725,
-        "z": "34265cd.7205424",
+        "x": 546.7499656677246,
+        "y": 2652.7385773658752,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8cfa77fd.d126b8",
+        "id": "bb7020bf.917f88",
         "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": 1819.0836143493652,
-        "y": 5211.025192737579,
-        "z": "34265cd.7205424",
+        "x": 1782.0835990905762,
+        "y": 5308.025188922882,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6762299c.778d8"
+                "a92688a9.e4a6b"
             ]
         ]
     },
     {
-        "id": "6762299c.778d8",
+        "id": "a92688a9.e4a6b",
         "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": 2086.4169578552246,
-        "y": 5210.025681018829,
-        "z": "34265cd.7205424",
+        "x": 2049.4169425964355,
+        "y": 5307.025677204132,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7d53a97d.be26"
+                "ec22b21e.0a4ac"
             ]
         ]
     },
     {
-        "id": "d1f18ef1.182398",
+        "id": "4ed6e311.93f5fc",
         "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": 2518.4165687561035,
-        "y": 5276.6913805007935,
-        "z": "34265cd.7205424",
+        "x": 2481.4165534973145,
+        "y": 5373.691376686096,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "77214afc.517d0c"
+                "303dd138.323a4e"
             ]
         ]
     },
     {
-        "id": "7d53a97d.be26",
+        "id": "ec22b21e.0a4ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2297.4167289733887,
-        "y": 5210.025137424469,
-        "z": "34265cd.7205424",
+        "x": 2260.4167137145996,
+        "y": 5307.025133609772,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "34424215.2a711e",
-                "d1f18ef1.182398"
+                "15a125a7.f8a182",
+                "4ed6e311.93f5fc"
             ]
         ]
     },
     {
-        "id": "34424215.2a711e",
+        "id": "15a125a7.f8a182",
         "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": 2517.4170570373535,
-        "y": 5130.02503490448,
-        "z": "34265cd.7205424",
+        "x": 2480.4170417785645,
+        "y": 5227.025031089783,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "77214afc.517d0c",
+        "id": "303dd138.323a4e",
         "type": "switchNode",
         "name": "switch address family",
         "xml": "<switch test='`$tmp.address-family`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2757.416660308838,
-        "y": 5275.02520275116,
-        "z": "34265cd.7205424",
+        "x": 2720.416645050049,
+        "y": 5372.025198936462,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "466ce5a0.fa2a7c",
-                "e5989ca0.8172d"
+                "e6ae0d09.a09cf",
+                "4f6d9652.0c3078"
             ]
         ]
     },
     {
-        "id": "466ce5a0.fa2a7c",
+        "id": "e6ae0d09.a09cf",
         "type": "outcome",
         "name": "ipv4",
         "xml": "<outcome value='ipv4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2954.5596656799316,
-        "y": 5178.59646320343,
-        "z": "34265cd.7205424",
+        "x": 2917.5596504211426,
+        "y": 5275.596459388733,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "16109ed1.313bd1"
+                "602361cc.c4df38"
             ]
         ]
     },
     {
-        "id": "e5989ca0.8172d",
+        "id": "4f6d9652.0c3078",
         "type": "outcome",
         "name": "ipv6",
         "xml": "<outcome value='ipv6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2952.178737640381,
-        "y": 5358.358494758606,
-        "z": "34265cd.7205424",
+        "x": 2915.178722381592,
+        "y": 5455.358490943909,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "9a0c5b84.5a57f"
+                "1a69583f.183678"
             ]
         ]
     },
     {
-        "id": "cf096cd1.ca06e8",
+        "id": "e702daf4.edb6a8",
         "type": "comment",
         "name": "Fixed IPs",
         "info": "",
         "comments": "",
-        "x": 1836.0836296081543,
-        "y": 5172.692569732666,
-        "z": "34265cd.7205424",
+        "x": 1799.0836143493652,
+        "y": 5269.692565917969,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ba22ae12.2926b",
+        "id": "c09d2003.b8f32",
         "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": 3397.892795562744,
-        "y": 5126.929543177288,
-        "z": "34265cd.7205424",
+        "x": 3360.892780303955,
+        "y": 5223.929539362591,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a96cb36a.8783d8"
+                "1c4f2098.c55b27"
             ]
         ]
     },
     {
-        "id": "16109ed1.313bd1",
+        "id": "602361cc.c4df38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3104.5596656799316,
-        "y": 5178.596381823223,
-        "z": "34265cd.7205424",
+        "x": 3067.5596504211426,
+        "y": 5275.596378008526,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ba22ae12.2926b",
-                "c1872588.7583"
+                "c09d2003.b8f32",
+                "3d116e3f.dedbd2"
             ]
         ]
     },
     {
-        "id": "2901367b.3a7652",
+        "id": "a1a5338b.dea9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3811.3926696777344,
-        "y": 5126.914035479229,
-        "z": "34265cd.7205424",
+        "x": 3774.3926544189453,
+        "y": 5223.914031664532,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a7be1c39.6ee63",
-                "b8d50b6.e90cc78"
+                "c5ce8f8a.5c8cc",
+                "4f9c607a.ce1c88"
             ]
         ]
     },
     {
-        "id": "a96cb36a.8783d8",
+        "id": "1c4f2098.c55b27",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3654.559555053711,
-        "y": 5126.929705301922,
-        "z": "34265cd.7205424",
+        "x": 3617.559539794922,
+        "y": 5223.9297014872245,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2901367b.3a7652"
+                "a1a5338b.dea9"
             ]
         ]
     },
     {
-        "id": "c1872588.7583",
+        "id": "3d116e3f.dedbd2",
         "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": 3392.893039703369,
-        "y": 5225.262962023418,
-        "z": "34265cd.7205424",
+        "x": 3355.89302444458,
+        "y": 5322.262958208721,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c76a4fda.833a4",
-                "53b8f95f.e81ec"
+                "b2f60d32.750248",
+                "9412527d.7ae5b8"
             ]
         ]
     },
     {
-        "id": "64905913.ec2ab",
+        "id": "562e333b.9aa834",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3813.0592918395996,
-        "y": 5196.914006868999,
-        "z": "34265cd.7205424",
+        "x": 3776.0592765808105,
+        "y": 5293.914003054302,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a4494b11.30c988",
-                "b8d50b6.e90cc78"
+                "d6d217c2.575b08",
+                "4f9c607a.ce1c88"
             ]
         ]
     },
     {
-        "id": "ea0b0cf4.b0b87",
+        "id": "385833b4.f6a1f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3813.059368133545,
-        "y": 5249.913765589397,
-        "z": "34265cd.7205424",
+        "x": 3776.059352874756,
+        "y": 5346.9137617747,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3b6a1bff.11e25c",
-                "b8d50b6.e90cc78"
+                "eacb1b8b.899fc",
+                "4f9c607a.ce1c88"
             ]
         ]
     },
     {
-        "id": "c76a4fda.833a4",
+        "id": "b2f60d32.750248",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3656.226177215576,
-        "y": 5196.929676691692,
-        "z": "34265cd.7205424",
+        "x": 3619.226161956787,
+        "y": 5293.929672876995,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "64905913.ec2ab"
+                "562e333b.9aa834"
             ]
         ]
     },
     {
-        "id": "53b8f95f.e81ec",
+        "id": "9412527d.7ae5b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3664.797710418701,
-        "y": 5249.54882113139,
-        "z": "34265cd.7205424",
+        "x": 3627.797695159912,
+        "y": 5346.548817316692,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ea0b0cf4.b0b87"
+                "385833b4.f6a1f4"
             ]
         ]
     },
     {
-        "id": "5f65e4dc.17ee84",
+        "id": "fb1894e6.eb936",
         "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": 3396.702533721924,
-        "y": 5305.977599143982,
-        "z": "34265cd.7205424",
+        "x": 3359.7025184631348,
+        "y": 5402.977595329285,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c7c91c2b.8530c8"
+                "bb93e24f.0ddfa"
             ]
         ]
     },
     {
-        "id": "9a0c5b84.5a57f",
+        "id": "1a69583f.183678",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3103.3694038391113,
-        "y": 5357.644437789917,
-        "z": "34265cd.7205424",
+        "x": 3066.3693885803223,
+        "y": 5454.64443397522,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "5f65e4dc.17ee84",
-                "6821e286.f06a64"
+                "fb1894e6.eb936",
+                "ff950167.1fb1e"
             ]
         ]
     },
     {
-        "id": "20bc2782.743bc",
+        "id": "af4f59e8.34e16",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3810.202407836914,
-        "y": 5305.962091445923,
-        "z": "34265cd.7205424",
+        "x": 3773.202392578125,
+        "y": 5402.962087631226,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1d21480c.1addf8",
-                "b8d50b6.e90cc78"
+                "e1c04fe9.9abb6",
+                "4f9c607a.ce1c88"
             ]
         ]
     },
     {
-        "id": "c7c91c2b.8530c8",
+        "id": "bb93e24f.0ddfa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3653.3692932128906,
-        "y": 5305.977761268616,
-        "z": "34265cd.7205424",
+        "x": 3616.3692779541016,
+        "y": 5402.9777574539185,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "20bc2782.743bc"
+                "af4f59e8.34e16"
             ]
         ]
     },
     {
-        "id": "6821e286.f06a64",
+        "id": "ff950167.1fb1e",
         "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": 3391.702777862549,
-        "y": 5404.311017990112,
-        "z": "34265cd.7205424",
+        "x": 3354.7027626037598,
+        "y": 5501.311014175415,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8cd900c5.0fd1d",
-                "7505a4c8.0ea53c"
+                "92d98e03.b2aa9",
+                "2492559a.c4998a"
             ]
         ]
     },
     {
-        "id": "b7b6484f.d8c77",
+        "id": "1c4e1681.7e4871",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3811.8690299987793,
-        "y": 5375.962062835693,
-        "z": "34265cd.7205424",
+        "x": 3774.8690147399902,
+        "y": 5472.962059020996,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e3d10ed9.82b7b8",
-                "b8d50b6.e90cc78"
+                "b00c290a.190b9",
+                "4f9c607a.ce1c88"
             ]
         ]
     },
     {
-        "id": "79bf1748.e06bb8",
+        "id": "71aef803.40248",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3811.8691062927246,
-        "y": 5428.961821556091,
-        "z": "34265cd.7205424",
+        "x": 3774.8690910339355,
+        "y": 5525.961817741394,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fedf80c9.88e5f",
-                "b8d50b6.e90cc78"
+                "f9dafb05.46c9b",
+                "4f9c607a.ce1c88"
             ]
         ]
     },
     {
-        "id": "8cd900c5.0fd1d",
+        "id": "92d98e03.b2aa9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3655.035915374756,
-        "y": 5375.977732658386,
-        "z": "34265cd.7205424",
+        "x": 3618.035900115967,
+        "y": 5472.977728843689,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b7b6484f.d8c77"
+                "1c4e1681.7e4871"
             ]
         ]
     },
     {
-        "id": "7505a4c8.0ea53c",
+        "id": "2492559a.c4998a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3663.607448577881,
-        "y": 5428.5968770980835,
-        "z": "34265cd.7205424",
+        "x": 3626.607433319092,
+        "y": 5525.596873283386,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "79bf1748.e06bb8"
+                "71aef803.40248"
             ]
         ]
     },
     {
-        "id": "474d2262.a76184",
+        "id": "93d8dd9c.4ab7e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1118.083583831787,
-        "y": 6134.692134380341,
-        "z": "34265cd.7205424",
+        "x": 1081.083568572998,
+        "y": 6231.692130565643,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b6a8d268.c987",
-                "8b5e2bc.0d8cdd8",
-                "81d51660.a0c9e8",
-                "a9042f25.4b114"
+                "c8fd9787.8452c",
+                "a523e3d.fb4e3a",
+                "bcda90cb.440fb8",
+                "d730be4.76af4c"
             ]
         ]
     },
     {
-        "id": "5ff1efff.4270b8",
+        "id": "3fcdc941.269b36",
         "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": 1766.0837593078613,
-        "y": 6257.02588224411,
-        "z": "34265cd.7205424",
+        "x": 1729.0837440490723,
+        "y": 6354.025878429413,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f2b022e3.1f756"
+                "ddc96fa8.7a60c"
             ]
         ]
     },
     {
-        "id": "e3153e0c.d09088",
+        "id": "5ebcb9e7.4aa54",
         "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": 1849.0836143493652,
-        "y": 6088.358893871307,
-        "z": "34265cd.7205424",
+        "x": 1812.0835990905762,
+        "y": 6185.35889005661,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6c580401.058424",
-                "381a766c.6ae85a"
+                "573bd3c5.98aba4",
+                "1bbdfbf6.b3d06c"
             ]
         ]
     },
     {
-        "id": "81d51660.a0c9e8",
+        "id": "bcda90cb.440fb8",
         "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": 1357.0836067199707,
-        "y": 6146.358966350555,
-        "z": "34265cd.7205424",
+        "x": 1320.0835914611816,
+        "y": 6243.358962535858,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a116ff51.f71318"
+                "63669aaf.74e08c"
             ]
         ]
     },
     {
-        "id": "a116ff51.f71318",
+        "id": "63669aaf.74e08c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1583.0836067199707,
-        "y": 6144.358966350555,
-        "z": "34265cd.7205424",
+        "x": 1546.0835914611816,
+        "y": 6241.358962535858,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e3153e0c.d09088",
-                "caa9e69f.d253a",
-                "5ff1efff.4270b8"
+                "5ebcb9e7.4aa54",
+                "8d460902.156",
+                "3fcdc941.269b36"
             ]
         ]
     },
     {
-        "id": "af60e3c3.bb56a",
+        "id": "8f0f7206.35cad8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2244.583484649658,
-        "y": 6058.343266963959,
-        "z": "34265cd.7205424",
+        "x": 2207.583469390869,
+        "y": 6155.3432631492615,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f4049c01.0aeaf",
-                "269063c8.ce5a84"
+                "ac68386.d27d148",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "26f5dd9.f21b7a2",
+        "id": "f32c832d.fb25c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2244.5835609436035,
-        "y": 6111.343025684357,
-        "z": "34265cd.7205424",
+        "x": 2207.5835456848145,
+        "y": 6208.343021869659,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "5573d94b.dc5",
-                "269063c8.ce5a84"
+                "5c926ac4.441d54",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "6c580401.058424",
+        "id": "573bd3c5.98aba4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2087.7503700256348,
-        "y": 6058.358936786652,
-        "z": "34265cd.7205424",
+        "x": 2050.7503547668457,
+        "y": 6155.358932971954,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "af60e3c3.bb56a"
+                "8f0f7206.35cad8"
             ]
         ]
     },
     {
-        "id": "381a766c.6ae85a",
+        "id": "1bbdfbf6.b3d06c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2096.3219032287598,
-        "y": 6110.978081226349,
-        "z": "34265cd.7205424",
+        "x": 2059.3218879699707,
+        "y": 6207.978077411652,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "26f5dd9.f21b7a2"
+                "f32c832d.fb25c8"
             ]
         ]
     },
     {
-        "id": "cd3cd499.458be8",
+        "id": "26b909fe.b46aae",
         "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": 2184.7502098083496,
-        "y": 6201.025557041168,
-        "z": "34265cd.7205424",
+        "x": 2147.7501945495605,
+        "y": 6298.025553226471,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a45ccf9a.b8373",
-                "85e3b005.bd6568"
+                "369543b.0355ebc",
+                "d5fdb460.0834c8"
             ]
         ]
     },
     {
-        "id": "5c68b77d.81077",
+        "id": "fd955046.bf6118",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2587.916488647461,
-        "y": 6173.009899675846,
-        "z": "34265cd.7205424",
+        "x": 2550.916473388672,
+        "y": 6270.009895861149,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c60c031b.634f38",
-                "269063c8.ce5a84"
+                "1eb209e1.85fe36",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "40a56b3d.e7bfb4",
+        "id": "d7cc0097.28a2d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2587.9165649414062,
-        "y": 6226.009658396244,
-        "z": "34265cd.7205424",
+        "x": 2550.916549682617,
+        "y": 6323.009654581547,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bdc62da9.93398",
-                "269063c8.ce5a84"
+                "703340a7.64aea8",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "a45ccf9a.b8373",
+        "id": "369543b.0355ebc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2431.0833740234375,
-        "y": 6173.025569498539,
-        "z": "34265cd.7205424",
+        "x": 2394.0833587646484,
+        "y": 6270.025565683842,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "5c68b77d.81077"
+                "fd955046.bf6118"
             ]
         ]
     },
     {
-        "id": "85e3b005.bd6568",
+        "id": "d5fdb460.0834c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2439.6549072265625,
-        "y": 6225.644713938236,
-        "z": "34265cd.7205424",
+        "x": 2402.6548919677734,
+        "y": 6322.644710123539,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "40a56b3d.e7bfb4"
+                "d7cc0097.28a2d"
             ]
         ]
     },
     {
-        "id": "12a683dc.f7d1cc",
+        "id": "b35a3553.69f82",
         "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": 1852.4169425964355,
-        "y": 6411.69157743454,
-        "z": "34265cd.7205424",
+        "x": 1815.4169273376465,
+        "y": 6508.6915736198425,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f3231ce.0a38d6",
-                "5e4e24ef.38b0bc"
+                "36e92cf1.e11e04",
+                "8cc2b975.04ae18"
             ]
         ]
     },
     {
-        "id": "a9042f25.4b114",
+        "id": "d730be4.76af4c",
         "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": 1360.416934967041,
-        "y": 6468.691649913788,
-        "z": "34265cd.7205424",
+        "x": 1323.416919708252,
+        "y": 6565.691646099091,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "669eaafe.ae3adc"
+                "d0c28ec3.c731b"
             ]
         ]
     },
     {
-        "id": "669eaafe.ae3adc",
+        "id": "d0c28ec3.c731b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1586.416934967041,
-        "y": 6467.691649913788,
-        "z": "34265cd.7205424",
+        "x": 1549.416919708252,
+        "y": 6564.691646099091,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "12a683dc.f7d1cc",
-                "475a576d.8e3c28",
-                "81320c04.9ba968"
+                "b35a3553.69f82",
+                "b0707c4.6ea4d",
+                "7d5e2a4c.059314"
             ]
         ]
     },
     {
-        "id": "2b2655ee.d0e88a",
+        "id": "719917b1.86ce1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2247.9168128967285,
-        "y": 6381.675950527191,
-        "z": "34265cd.7205424",
+        "x": 2210.9167976379395,
+        "y": 6478.675946712494,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "37375282.76ddb6",
-                "269063c8.ce5a84"
+                "67c04d7.9f55234",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "4588595a.f76a3",
+        "id": "805fb62e.923ed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2247.916889190674,
-        "y": 6434.675709247589,
-        "z": "34265cd.7205424",
+        "x": 2210.9168739318848,
+        "y": 6531.675705432892,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "48c2cba4.91f6cc",
-                "269063c8.ce5a84"
+                "3bd1f48b.4c0b2c",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "f3231ce.0a38d6",
+        "id": "36e92cf1.e11e04",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2091.083698272705,
-        "y": 6381.691620349884,
-        "z": "34265cd.7205424",
+        "x": 2054.083683013916,
+        "y": 6478.691616535187,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2b2655ee.d0e88a"
+                "719917b1.86ce1"
             ]
         ]
     },
     {
-        "id": "5e4e24ef.38b0bc",
+        "id": "8cc2b975.04ae18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2099.65523147583,
-        "y": 6434.310764789581,
-        "z": "34265cd.7205424",
+        "x": 2062.655216217041,
+        "y": 6531.310760974884,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4588595a.f76a3"
+                "805fb62e.923ed"
             ]
         ]
     },
     {
-        "id": "2c2d6569.a1c6a2",
+        "id": "dca0d1ee.17c198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2581.250068664551,
-        "y": 6494.676001131535,
-        "z": "34265cd.7205424",
+        "x": 2544.2500534057617,
+        "y": 6591.675997316837,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4a19d7b6.f2c47",
-                "269063c8.ce5a84"
+                "7345e678.7bf88",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "3ee8cc5c.76ddbc",
+        "id": "99fb4bfb.6119d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2581.250144958496,
-        "y": 6547.6757598519325,
-        "z": "34265cd.7205424",
+        "x": 2544.250129699707,
+        "y": 6644.675756037235,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "84c51507.94d668",
-                "269063c8.ce5a84"
+                "131ea97.a877f57",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "de9afd93.7c394",
+        "id": "b4c59645.4d87f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2424.4169540405273,
-        "y": 6494.691670954227,
-        "z": "34265cd.7205424",
+        "x": 2387.4169387817383,
+        "y": 6591.69166713953,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2c2d6569.a1c6a2"
+                "dca0d1ee.17c198"
             ]
         ]
     },
     {
-        "id": "6e9292b7.adab1c",
+        "id": "19a0a042.9844b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2432.9884872436523,
-        "y": 6547.310815393925,
-        "z": "34265cd.7205424",
+        "x": 2395.9884719848633,
+        "y": 6644.310811579227,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3ee8cc5c.76ddbc"
+                "99fb4bfb.6119d8"
             ]
         ]
     },
     {
-        "id": "636270ad.cb1f1",
+        "id": "8bf7fa79.126fb",
         "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": 2180.083797454834,
-        "y": 6523.358089923859,
-        "z": "34265cd.7205424",
+        "x": 2143.083782196045,
+        "y": 6620.358086109161,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "de9afd93.7c394",
-                "6e9292b7.adab1c"
+                "b4c59645.4d87f8",
+                "19a0a042.9844b8"
             ]
         ]
     },
     {
-        "id": "4f542d3d.52a65c",
+        "id": "92ab8c55.74cf88",
         "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": 1342.7502403259277,
-        "y": 4770.691873967648,
-        "z": "34265cd.7205424",
+        "x": 1305.7502250671387,
+        "y": 4867.69187015295,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "b6a8d268.c987",
+        "id": "c8fd9787.8452c",
         "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": 1313.4169960021973,
-        "y": 6018.692055404186,
-        "z": "34265cd.7205424",
+        "x": 1276.4169807434082,
+        "y": 6115.692051589489,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "caa9e69f.d253a",
+        "id": "8d460902.156",
         "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": 1786.4169616699219,
-        "y": 6146.69213527441,
-        "z": "34265cd.7205424",
+        "x": 1749.4169464111328,
+        "y": 6243.692131459713,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "475a576d.8e3c28",
+        "id": "b0707c4.6ea4d",
         "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": 1791.7502975463867,
-        "y": 6472.691738545895,
-        "z": "34265cd.7205424",
+        "x": 1754.7502822875977,
+        "y": 6569.691734731197,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "cb5ae333.4bb6c",
+        "id": "fd219437.f0a108",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1892.750415802002,
-        "y": 4730.692112863064,
-        "z": "34265cd.7205424",
+        "x": 1855.750400543213,
+        "y": 4827.692109048367,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fcab33e3.661e5"
+                "62a1d2ce.f5805c"
             ]
         ]
     },
     {
-        "id": "e9f0935c.0d26e",
+        "id": "13308bfd.0f2aec",
         "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": 660.1668167114258,
-        "y": 6805.692090034485,
-        "z": "34265cd.7205424",
+        "x": 623.1668014526367,
+        "y": 6902.692086219788,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bc1360c6.580c08"
+                "b2c99321.07804"
             ]
         ]
     },
     {
-        "id": "bc1360c6.580c08",
+        "id": "b2c99321.07804",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1004.5002326965332,
-        "y": 6805.025585174561,
-        "z": "34265cd.7205424",
+        "x": 967.5002174377441,
+        "y": 6902.025581359863,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a09eae64.f34c68"
+                "9faf9bf7.4ac728"
             ]
         ]
     },
     {
-        "id": "a09eae64.f34c68",
+        "id": "9faf9bf7.4ac728",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1159.5001068115234,
-        "y": 6805.025381088257,
-        "z": "34265cd.7205424",
+        "x": 1122.5000915527344,
+        "y": 6902.02537727356,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3f7dfdbe.c1b85a",
-                "1a40ddac.06f67a"
+                "9d5c7913.8b1318",
+                "7d6098e9.a14988"
             ]
         ]
     },
     {
-        "id": "3f7dfdbe.c1b85a",
+        "id": "9d5c7913.8b1318",
         "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": 1340.273723602295,
-        "y": 6777.763387203217,
-        "z": "34265cd.7205424",
+        "x": 1303.2737083435059,
+        "y": 6874.763383388519,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "effbab1c.8eeb18",
+        "id": "f8ca447b.c9d998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 314.64286041259766,
-        "y": 556.5714378356934,
-        "z": "34265cd.7205424",
+        "x": 277.6428451538086,
+        "y": 653.5714340209961,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d583179d.999f08",
-                "13d1edde.2c3cc2",
-                "356786ed.1c1db2",
-                "527b3c86.073724",
-                "f269ddb2.03ac18",
-                "aca51e3b.78a188",
-                "a6f8df46.880ce8",
-                "d918a5d3.4b678",
-                "7933c6b5.bef96",
-                "b13baffe.18c468"
+                "ba0281e8.c6d89",
+                "16a1cdd5.b488f2",
+                "d8c6245c.30876",
+                "3ad4001f.cd4388",
+                "9f361c75.f7c698",
+                "b1d0605e.841ca",
+                "32e92ddc.ae5c1a",
+                "bb29ba7b.f486c",
+                "ac910a9d.5490c8",
+                "bf8d316e.62c2d",
+                "54659cd5.5a9534"
             ]
         ]
     },
     {
-        "id": "d4b60897.e18598",
+        "id": "f0a7970e.17889",
         "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": 605.6547050476074,
-        "y": 2622.1672010421753,
-        "z": "34265cd.7205424",
+        "x": 568.6546897888184,
+        "y": 2719.167197227478,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7205c7e2.e07a68",
-                "338ca0a7.bfe7d8"
+                "375d9d1a.2a0dca",
+                "ce7a0e15.45e6b8"
             ]
         ]
     },
     {
-        "id": "7205c7e2.e07a68",
+        "id": "375d9d1a.2a0dca",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 777.5594367980957,
-        "y": 2599.5482215881348,
-        "z": "34265cd.7205424",
+        "x": 740.5594215393066,
+        "y": 2696.5482177734375,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "cee08d41.b2fe6"
+                "2c31b540.c0b982"
             ]
         ]
     },
     {
-        "id": "338ca0a7.bfe7d8",
+        "id": "ce7a0e15.45e6b8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 779.2260894775391,
-        "y": 2644.5480604171753,
-        "z": "34265cd.7205424",
+        "x": 742.22607421875,
+        "y": 2741.548056602478,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "afc9b079.ac8a6"
+                "4a24532d.397b84"
             ]
         ]
     },
     {
-        "id": "cee08d41.b2fe6",
+        "id": "2c31b540.c0b982",
         "type": "set",
         "name": "set automated-assignment to true",
         "xml": "<set>\n<parameter name='automated-assignment' value='true' />\n",
         "comments": "",
-        "x": 992.5594215393066,
-        "y": 2597.881392478943,
-        "z": "34265cd.7205424",
+        "x": 955.5594062805176,
+        "y": 2694.8813886642456,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "afc9b079.ac8a6",
+        "id": "4a24532d.397b84",
         "type": "set",
         "name": "set automated-assignment to false",
         "xml": "<set>\n<parameter name='automated-assignment' value='false' />\n",
         "comments": "",
-        "x": 990.8927421569824,
-        "y": 2642.8813123703003,
-        "z": "34265cd.7205424",
+        "x": 953.8927268981934,
+        "y": 2739.881308555603,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "81320c04.9ba968",
+        "id": "7d5e2a4c.059314",
         "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": 1767.1788291931152,
-        "y": 6571.572162151337,
-        "z": "34265cd.7205424",
+        "x": 1730.1788139343262,
+        "y": 6668.572158336639,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d27afbea.8fdbb"
+                "ea947930.9aa72"
             ]
         ]
     },
     {
-        "id": "cf288013.27e988",
+        "id": "a75def4f.6ee6e",
         "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": 584.4168014526367,
-        "y": 3982.3580837249756,
-        "z": "34265cd.7205424",
+        "x": 547.4167861938477,
+        "y": 4079.3580799102783,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4b547438.e5a1e4"
+                "46a5a77d.d755f8"
             ]
         ]
     },
     {
-        "id": "4b547438.e5a1e4",
+        "id": "46a5a77d.d755f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 774.9168701171875,
-        "y": 3983.191318511963,
-        "z": "34265cd.7205424",
+        "x": 737.9168548583984,
+        "y": 4080.1913146972656,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e115a59a.78977"
+                "8c7d407.6bcf7c"
             ]
         ]
     },
     {
-        "id": "e115a59a.78977",
+        "id": "8c7d407.6bcf7c",
         "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": 976.4168014526367,
-        "y": 3982.3580837249756,
-        "z": "34265cd.7205424",
+        "x": 939.4167861938477,
+        "y": 4079.3580799102783,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c279839c.179e2"
+                "35ad2d4.547ffd2"
             ]
         ]
     },
     {
-        "id": "c279839c.179e2",
+        "id": "35ad2d4.547ffd2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1166.2501220703125,
-        "y": 3981.8575229644775,
-        "z": "34265cd.7205424",
+        "x": 1129.2501068115234,
+        "y": 4078.8575191497803,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "9c5890c1.1bc73"
+                "f487beec.088c"
             ]
         ]
     },
     {
-        "id": "9c5890c1.1bc73",
+        "id": "f487beec.088c",
         "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": 1455.7500953674316,
-        "y": 3980.358165740967,
-        "z": "34265cd.7205424",
+        "x": 1418.7500801086426,
+        "y": 4077.3581619262695,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a30af21d.78b66",
-                "54be536b.883c7c"
+                "a0408b33.43b78",
+                "3bacb1f6.d56f8e"
             ]
         ]
     },
     {
-        "id": "a30af21d.78b66",
+        "id": "a0408b33.43b78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1726.7500343322754,
-        "y": 3885.0248680114746,
-        "z": "34265cd.7205424",
+        "x": 1689.7500190734863,
+        "y": 3982.0248641967773,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6573ac5d.e2d6fc"
+                "35e45c1b.0b696c"
             ]
         ]
     },
     {
-        "id": "6573ac5d.e2d6fc",
+        "id": "35e45c1b.0b696c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1873.9405517578125,
-        "y": 3883.5728826522827,
-        "z": "34265cd.7205424",
+        "x": 1836.9405364990234,
+        "y": 3980.5728788375854,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d4e308ce.5712b",
-                "f3cab335.7ec9f"
+                "e1550da4.520918",
+                "1980bda6.0907fa"
             ]
         ]
     },
     {
-        "id": "54be536b.883c7c",
+        "id": "3bacb1f6.d56f8e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727.5832443237305,
-        "y": 4129.691747665405,
-        "z": "34265cd.7205424",
+        "x": 1690.5832290649414,
+        "y": 4226.691743850708,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8b99514d.224a68"
+                "d2a8eaa8.b65ea"
             ]
         ]
     },
     {
-        "id": "bdec068a.d17588",
+        "id": "1226c3aa.88da74",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2145.9164962768555,
-        "y": 4131.69150352478,
-        "z": "34265cd.7205424",
+        "x": 2108.9164810180664,
+        "y": 4228.691499710083,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2380b499.33cb74",
-                "2a3d42f3.0625f6",
-                "9050219d.292618",
-                "a92d624e.c2d3a8",
-                "64298756.8d8e3",
-                "ee1be000.48bb78",
-                "fa830b25.a2ef78",
-                "18757bd7.bc1504"
+                "c57415e5.fd3248",
+                "e4e8595c.9b58f",
+                "e4b60504.f981a8",
+                "156f261a.863eca",
+                "495279ca.733358",
+                "c85f9edd.97f348",
+                "de61ca34.e42ee8",
+                "1f01eb84.19964c"
             ]
         ]
     },
     {
-        "id": "2a3d42f3.0625f6",
+        "id": "e4e8595c.9b58f",
         "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": 2328.416675567627,
-        "y": 3974.024751663208,
-        "z": "34265cd.7205424",
+        "x": 2291.416660308838,
+        "y": 4071.0247478485107,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2377be3.2805842"
+                "7a857ed.1aa998"
             ]
         ]
     },
     {
-        "id": "2380b499.33cb74",
+        "id": "c57415e5.fd3248",
         "type": "set",
         "name": "set found-related-network to false",
         "xml": "<set>\n<parameter name='found-related-network' value='false' />\n",
         "comments": "",
-        "x": 2368.4167518615723,
-        "y": 3915.6915283203125,
-        "z": "34265cd.7205424",
+        "x": 2331.416736602783,
+        "y": 4012.6915245056152,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "f214ef27.8c7068",
+        "id": "bce8e032.adb05",
         "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": 2727.4166374206543,
-        "y": 3950.6910152435303,
-        "z": "34265cd.7205424",
+        "x": 2690.4166221618652,
+        "y": 4047.691011428833,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7ede6549.805acc"
+                "e0911b99.e70388"
             ]
         ]
     },
     {
-        "id": "2377be3.2805842",
+        "id": "7a857ed.1aa998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2516.416675567627,
-        "y": 3974.024751663208,
-        "z": "34265cd.7205424",
+        "x": 2479.416660308838,
+        "y": 4071.0247478485107,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f214ef27.8c7068",
-                "ac51f9c5.7f381"
+                "bce8e032.adb05",
+                "62c152f0.7d2894"
             ]
         ]
     },
     {
-        "id": "7ede6549.805acc",
+        "id": "e0911b99.e70388",
         "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": 2979.4165534973145,
-        "y": 3950.6910915374756,
-        "z": "34265cd.7205424",
+        "x": 2942.4165382385254,
+        "y": 4047.6910877227783,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "639ffefa.c6a668"
+                "1ffef684.6c9e81"
             ]
         ]
     },
     {
-        "id": "8b99514d.224a68",
+        "id": "d2a8eaa8.b65ea",
         "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": 1931.916618347168,
-        "y": 4130.35849571228,
-        "z": "34265cd.7205424",
+        "x": 1894.916603088379,
+        "y": 4227.358491897583,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bdec068a.d17588"
+                "1226c3aa.88da74"
             ]
         ]
     },
     {
-        "id": "639ffefa.c6a668",
+        "id": "1ffef684.6c9e81",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3179.4165534973145,
-        "y": 3948.6910915374756,
-        "z": "34265cd.7205424",
+        "x": 3142.4165382385254,
+        "y": 4045.6910877227783,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "81afa752.330a7"
+                "766ba0f5.f4bb98"
             ]
         ]
     },
     {
-        "id": "81afa752.330a7",
+        "id": "766ba0f5.f4bb98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3333.4165534973145,
-        "y": 3946.6910915374756,
-        "z": "34265cd.7205424",
+        "x": 3296.4165382385254,
+        "y": 4043.6910877227783,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "9b9cff35.d523",
-                "46e64037.6ec64",
-                "8025f3eb.bd5ea"
+                "15001ccf.c8a18b",
+                "232797a8.b52268",
+                "f2dd29bc.54a1a"
             ]
         ]
     },
     {
-        "id": "9b9cff35.d523",
+        "id": "15001ccf.c8a18b",
         "type": "set",
         "name": "set found-related-network to true",
         "xml": "<set>\n<parameter name='found-related-network' value='true' />\n",
         "comments": "",
-        "x": 3565.4167137145996,
-        "y": 3906.357675552368,
-        "z": "34265cd.7205424",
+        "x": 3528.4166984558105,
+        "y": 4003.357671737671,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "46e64037.6ec64",
+        "id": "232797a8.b52268",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3488.7498893737793,
-        "y": 3993.024425506592,
-        "z": "34265cd.7205424",
+        "x": 3451.7498741149902,
+        "y": 4090.0244216918945,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "9050219d.292618",
+        "id": "e4b60504.f981a8",
         "type": "switchNode",
         "name": "switch found-related-network",
         "xml": "<switch test='`$found-related-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2363.9165649414062,
-        "y": 4074.6916370391846,
-        "z": "34265cd.7205424",
+        "x": 2326.916549682617,
+        "y": 4171.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2c771fce.f6f0e"
+                "72439ee4.6178c8"
             ]
         ]
     },
     {
-        "id": "2c771fce.f6f0e",
+        "id": "72439ee4.6178c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2557.9165649414062,
-        "y": 4072.6916370391846,
-        "z": "34265cd.7205424",
+        "x": 2520.916549682617,
+        "y": 4169.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ed2c165a.75be88"
+                "13dbfbb2.053ff4"
             ]
         ]
     },
     {
-        "id": "ed2c165a.75be88",
+        "id": "13dbfbb2.053ff4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2687.9165649414062,
-        "y": 4072.6916370391846,
-        "z": "34265cd.7205424",
+        "x": 2650.916549682617,
+        "y": 4169.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e1873883.a0b338",
-                "f3cab335.7ec9f"
+                "7b08fad7.a132ec",
+                "1980bda6.0907fa"
             ]
         ]
     },
     {
-        "id": "a92d624e.c2d3a8",
+        "id": "156f261a.863eca",
         "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": 2425.9165649414062,
-        "y": 4122.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2388.916549682617,
+        "y": 4219.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ee1be000.48bb78",
+        "id": "c85f9edd.97f348",
         "type": "switchNode",
         "name": "switch rn-index",
         "xml": "<switch test='`$rn-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2313.9165649414062,
-        "y": 4230.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2276.916549682617,
+        "y": 4327.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "74c68449.7a6374"
+                "ef7434da.bc93f"
             ]
         ]
     },
     {
-        "id": "64298756.8d8e3",
+        "id": "495279ca.733358",
         "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": 2385.9165649414062,
-        "y": 4174.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2348.916549682617,
+        "y": 4271.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "74c68449.7a6374",
+        "id": "ef7434da.bc93f",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2477.9165649414062,
-        "y": 4230.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2440.916549682617,
+        "y": 4327.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8aa2ab54.ceea58"
+                "c24d1bf8.2f47d8"
             ]
         ]
     },
     {
-        "id": "8aa2ab54.ceea58",
+        "id": "c24d1bf8.2f47d8",
         "type": "set",
         "name": "set rn-index to 0",
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",
         "comments": "",
-        "x": 2637.9165649414062,
-        "y": 4230.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2600.916549682617,
+        "y": 4327.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "fa830b25.a2ef78",
+        "id": "de61ca34.e42ee8",
         "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": 2337.9165649414062,
-        "y": 4282.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2300.916549682617,
+        "y": 4379.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "18757bd7.bc1504",
+        "id": "1f01eb84.19964c",
         "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": 2355.9165649414062,
-        "y": 4334.691637039185,
-        "z": "34265cd.7205424",
+        "x": 2318.916549682617,
+        "y": 4431.691633224487,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ac51f9c5.7f381",
+        "id": "62c152f0.7d2894",
         "type": "switchNode",
         "name": "switch found-related-network",
         "xml": "<switch test='`$found-related-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2740.416660308838,
-        "y": 3998.3578758239746,
-        "z": "34265cd.7205424",
+        "x": 2703.416645050049,
+        "y": 4095.3578720092773,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8dfcb5e2.bf7d2"
+                "85bfa485.399358"
             ]
         ]
     },
     {
-        "id": "8dfcb5e2.bf7d2",
+        "id": "85bfa485.399358",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2937.083522796631,
-        "y": 3998.358247756958,
-        "z": "34265cd.7205424",
+        "x": 2900.083507537842,
+        "y": 4095.3582439422607,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "49e231.bdb7fdd"
+                "bb00c0c7.52dd78"
             ]
         ]
     },
     {
-        "id": "49e231.bdb7fdd",
+        "id": "bb00c0c7.52dd78",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3067.083408355713,
-        "y": 3996.6913719177246,
-        "z": "34265cd.7205424",
+        "x": 3030.083393096924,
+        "y": 4093.6913681030273,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "8025f3eb.bd5ea",
+        "id": "f2dd29bc.54a1a",
         "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": 3507.0836219787598,
-        "y": 3948.3582458496094,
-        "z": "34265cd.7205424",
+        "x": 3470.0836067199707,
+        "y": 4045.358242034912,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "67c600cd.b9cba",
+        "id": "9c6dc578.9d7fc",
         "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": 1795.9881134033203,
-        "y": 4977.882298946381,
-        "z": "34265cd.7205424",
+        "x": 1758.9880981445312,
+        "y": 5074.882295131683,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "def6cb8a.75abd",
+        "id": "aba2a62.76d55d8",
         "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": 1777.6547355651855,
-        "y": 5044.548804759979,
-        "z": "34265cd.7205424",
+        "x": 1740.6547203063965,
+        "y": 5141.548800945282,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "cec4e53.0593898",
-                "73e9c7c7.e33118"
+                "afcda996.4564e",
+                "6cc31709.9e47c8"
             ]
         ]
     },
     {
-        "id": "cec4e53.0593898",
+        "id": "afcda996.4564e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1966.6547164916992,
-        "y": 5020.215418279171,
-        "z": "34265cd.7205424",
+        "x": 1929.6547012329102,
+        "y": 5117.215414464474,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6c56796a.9785"
+                "d55c685e.dfaad"
             ]
         ]
     },
     {
-        "id": "6c56796a.9785",
+        "id": "d55c685e.dfaad",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2133.821464538574,
-        "y": 5036.009851872921,
-        "z": "34265cd.7205424",
+        "x": 2096.821449279785,
+        "y": 5133.009848058224,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "56c543eb.6150dc",
-                "deea8b7a.34ee38"
+                "3296dfd.dbc53a",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "73e9c7c7.e33118",
+        "id": "6cc31709.9e47c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1971.6547164916992,
-        "y": 5069.881678044796,
-        "z": "34265cd.7205424",
+        "x": 1934.6547012329102,
+        "y": 5166.881674230099,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6c56796a.9785"
+                "d55c685e.dfaad"
             ]
         ]
     },
     {
-        "id": "58cb90bc.4bbef8",
+        "id": "47726d30.d34cb4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1572.4644355773926,
-        "y": 5247.16709280014,
-        "z": "34265cd.7205424",
+        "x": 1535.4644203186035,
+        "y": 5344.167088985443,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bb7a5471.736f58",
-                "8cfa77fd.d126b8",
-                "67c600cd.b9cba",
-                "def6cb8a.75abd",
-                "c24016d.89a2f68",
-                "e9947f94.840de"
+                "5f7cb894.98d27",
+                "bb7020bf.917f88",
+                "9c6dc578.9d7fc",
+                "aba2a62.76d55d8",
+                "dc3b1c12.9b901",
+                "e12a435b.3614b8"
             ]
         ]
     },
     {
-        "id": "bb7a5471.736f58",
+        "id": "5f7cb894.98d27",
         "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": 1807.9882774353027,
-        "y": 5122.406374454498,
-        "z": "34265cd.7205424",
+        "x": 1770.9882621765137,
+        "y": 5219.406370639801,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "197afe0.8443282",
+        "id": "800d9848.2437a8",
         "type": "comment",
         "name": "Floating IPs",
         "info": "",
         "comments": "",
-        "x": 1368.7500953674316,
-        "y": 6104.69149273634,
-        "z": "34265cd.7205424",
+        "x": 1331.7500801086426,
+        "y": 6201.691488921642,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "c24016d.89a2f68",
+        "id": "dc3b1c12.9b901",
         "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": 1792.0832786560059,
-        "y": 5518.691868305206,
-        "z": "34265cd.7205424",
+        "x": 1755.0832633972168,
+        "y": 5615.691864490509,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "56804039.82c95"
+                "f1babc88.16382"
             ]
         ]
     },
     {
-        "id": "1b4d007d.b0d738",
+        "id": "81279dea.3bc048",
         "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": 2430.416759490967,
-        "y": 5518.358376026154,
-        "z": "34265cd.7205424",
+        "x": 2393.4167442321777,
+        "y": 5615.358372211456,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "925d685c.856048",
-                "2b843689.1bb8aa"
+                "2abb93be.17e5dc",
+                "f8469e10.8f33"
             ]
         ]
     },
     {
-        "id": "c8275ab5.32ae",
+        "id": "99581456.eeacb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2802.249797821045,
-        "y": 5491.676324367523,
-        "z": "34265cd.7205424",
+        "x": 2765.249782562256,
+        "y": 5588.676320552826,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d01f264c.61c318",
-                "deea8b7a.34ee38"
+                "804becc1.78da28",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "ee39eeee.ad11d8",
+        "id": "104ad31e.9bcd75",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2802.2498741149902,
-        "y": 5544.676083087921,
-        "z": "34265cd.7205424",
+        "x": 2765.249858856201,
+        "y": 5641.676079273224,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "64482d7f.371044",
-                "deea8b7a.34ee38"
+                "7e2874de.0ebfec",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "925d685c.856048",
+        "id": "2abb93be.17e5dc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2645.4166831970215,
-        "y": 5491.691994190216,
-        "z": "34265cd.7205424",
+        "x": 2608.4166679382324,
+        "y": 5588.691990375519,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c8275ab5.32ae"
+                "99581456.eeacb8"
             ]
         ]
     },
     {
-        "id": "2b843689.1bb8aa",
+        "id": "f8469e10.8f33",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2653.9882164001465,
-        "y": 5544.311138629913,
-        "z": "34265cd.7205424",
+        "x": 2616.9882011413574,
+        "y": 5641.311134815216,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ee39eeee.ad11d8"
+                "104ad31e.9bcd75"
             ]
         ]
     },
     {
-        "id": "e9947f94.840de",
+        "id": "e12a435b.3614b8",
         "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": 1792.0834312438965,
-        "y": 5679.358223438263,
-        "z": "34265cd.7205424",
+        "x": 1755.0834159851074,
+        "y": 5776.358219623566,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a50b0d5a.ce5908"
+                "8b1c560f.764dd"
             ]
         ]
     },
     {
-        "id": "8135e354.1212a",
+        "id": "e33ae63b.e49888",
         "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": 2711.7504386901855,
-        "y": 5677.358218669891,
-        "z": "34265cd.7205424",
+        "x": 2674.7504234313965,
+        "y": 5774.358214855194,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "54f5fc79.be774c",
-                "c10c7043.50dca8"
+                "45ff040c.b512bc",
+                "e1063714.f1338"
             ]
         ]
     },
     {
-        "id": "cffcf5c1.1e4ec8",
+        "id": "938725ee.5957b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3118.583484649658,
-        "y": 5650.675517559052,
-        "z": "34265cd.7205424",
+        "x": 3081.583469390869,
+        "y": 5747.675513744355,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7a163627.fcef3",
-                "deea8b7a.34ee38"
+                "9d950f64.0102",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "6f874e0.8ac4234",
+        "id": "cfc84d0d.ef786",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3118.5835609436035,
-        "y": 5703.67527627945,
-        "z": "34265cd.7205424",
+        "x": 3081.5835456848145,
+        "y": 5800.675272464753,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "57dc1477.8da4b4",
-                "deea8b7a.34ee38"
+                "b2d45985.f53aa8",
+                "387bacc5.df1d84"
             ]
         ]
     },
     {
-        "id": "54f5fc79.be774c",
+        "id": "45ff040c.b512bc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2961.7503700256348,
-        "y": 5650.691187381745,
-        "z": "34265cd.7205424",
+        "x": 2924.7503547668457,
+        "y": 5747.691183567048,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "cffcf5c1.1e4ec8"
+                "938725ee.5957b8"
             ]
         ]
     },
     {
-        "id": "c10c7043.50dca8",
+        "id": "e1063714.f1338",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2970.3219032287598,
-        "y": 5703.310331821443,
-        "z": "34265cd.7205424",
+        "x": 2933.3218879699707,
+        "y": 5800.310328006745,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6f874e0.8ac4234"
+                "cfc84d0d.ef786"
             ]
         ]
     },
     {
-        "id": "b14df7f0.70279",
+        "id": "91124630.ba4798",
         "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": 2407.750270843506,
-        "y": 5677.358219623566,
-        "z": "34265cd.7205424",
+        "x": 2370.750255584717,
+        "y": 5774.358215808868,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8135e354.1212a"
+                "e33ae63b.e49888"
             ]
         ]
     },
     {
-        "id": "50d2cea2.bb528",
+        "id": "43e6fb56.3aad2c",
         "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": 656.0835952758789,
-        "y": 6919.108981132507,
-        "z": "34265cd.7205424",
+        "x": 619.0835800170898,
+        "y": 7016.10897731781,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "886b51f6.cb8c8",
+        "id": "8ddb6fb6.8a0038",
         "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": 466.1669006347656,
-        "y": 6972.108658790588,
-        "z": "34265cd.7205424",
+        "x": 429.16688537597656,
+        "y": 7069.108654975891,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "14aa8b5.d6278f5",
+        "id": "76eaad0d.045934",
         "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": 638.7499961853027,
-        "y": 2404.191040992737,
-        "z": "34265cd.7205424",
+        "x": 601.7499809265137,
+        "y": 2501.1910371780396,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "75d4819e.af875",
-                "b5b05f4.3353d2"
+                "55d69cd.6f87864",
+                "12fb7679.452c52"
             ]
         ]
     },
     {
-        "id": "75d4819e.af875",
+        "id": "55d69cd.6f87864",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 861.2499618530273,
-        "y": 2326.6910009384155,
-        "z": "34265cd.7205424",
+        "x": 824.2499465942383,
+        "y": 2423.6909971237183,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "35aa0744.80b5c8"
+                "aeaac31c.b0a03"
             ]
         ]
     },
     {
-        "id": "b5b05f4.3353d2",
+        "id": "12fb7679.452c52",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 862.9285621643066,
-        "y": 2499.309585571289,
-        "z": "34265cd.7205424",
+        "x": 825.9285469055176,
+        "y": 2596.309581756592,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "857ef89e.1a5408"
+                "d8e05d0.e811aa"
             ]
         ]
     },
     {
-        "id": "a0f0f960.3140c8",
+        "id": "526e48e0.ddfea8",
         "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": 1396.2500953674316,
-        "y": 3199.1907176971436,
-        "z": "34265cd.7205424",
+        "x": 1359.2500801086426,
+        "y": 3296.1907138824463,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "9d57c772.862988"
+                "7ac699be.e8b38"
             ]
         ]
     },
     {
-        "id": "9d57c772.862988",
+        "id": "7ac699be.e8b38",
         "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": 1644.5833549499512,
-        "y": 3199.1907176971436,
-        "z": "34265cd.7205424",
+        "x": 1607.583339691162,
+        "y": 3296.1907138824463,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "400506a5.64a12"
+                "5f865ea0.0676c"
             ]
         ]
     },
     {
-        "id": "4b70bca8.2d04e4",
+        "id": "b55fea55.8a7208",
         "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": 602.0832710266113,
-        "y": 2917.5240545272827,
-        "z": "34265cd.7205424",
+        "x": 565.0832557678223,
+        "y": 3014.5240507125854,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "76c0436b.ee91fc"
+                "1b0f2d74.152693"
             ]
         ]
     },
     {
-        "id": "76c0436b.ee91fc",
+        "id": "1b0f2d74.152693",
         "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": 783.7500495910645,
-        "y": 2916.1912031173706,
-        "z": "34265cd.7205424",
+        "x": 746.7500343322754,
+        "y": 3013.1911993026733,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f9241628.26f1"
+                "50487ae9.4141e4"
             ]
         ]
     },
     {
-        "id": "f9241628.26f1",
+        "id": "50487ae9.4141e4",
         "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": 984.9166221618652,
-        "y": 2916.023892402649,
-        "z": "34265cd.7205424",
+        "x": 947.9166069030762,
+        "y": 3013.0238885879517,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ba3c1b94.fddce"
+                "fc43a65d.ee5618"
             ]
         ]
     },
     {
-        "id": "ba3c1b94.fddce",
+        "id": "fc43a65d.ee5618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1197.083293914795,
-        "y": 2915.0242528915405,
-        "z": "34265cd.7205424",
+        "x": 1160.0832786560059,
+        "y": 3012.0242490768433,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "dd887364.2936e",
-                "ee8eb9ce.fef06",
-                "3f48cbb0.25141c",
-                "a0f0f960.3140c8"
+                "419335de.8f9efc",
+                "967eee1a.e0e6a",
+                "25438028.49af4",
+                "526e48e0.ddfea8"
             ]
         ]
     },
     {
-        "id": "dd887364.2936e",
+        "id": "419335de.8f9efc",
         "type": "set",
         "name": "set vnf-network-index to -1",
         "xml": "<set>\n<parameter name='vnf-network-index' value='-1' />\n",
         "comments": "",
-        "x": 1408.7500114440918,
-        "y": 2868.357466697693,
-        "z": "34265cd.7205424",
+        "x": 1371.7499961853027,
+        "y": 2965.3574628829956,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ee8eb9ce.fef06",
+        "id": "967eee1a.e0e6a",
         "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": 1390.4168014526367,
-        "y": 2915.024218559265,
-        "z": "34265cd.7205424",
+        "x": 1353.4167861938477,
+        "y": 3012.024214744568,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e1cac1a5.f31bf"
+                "46dba174.c40b4"
             ]
         ]
     },
     {
-        "id": "e1cac1a5.f31bf",
+        "id": "46dba174.c40b4",
         "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": 1632.0832710266113,
-        "y": 2913.357713699341,
-        "z": "34265cd.7205424",
+        "x": 1595.0832557678223,
+        "y": 3010.3577098846436,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d60f049.7085ef8"
+                "a012a02c.291a88"
             ]
         ]
     },
     {
-        "id": "d60f049.7085ef8",
+        "id": "a012a02c.291a88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1828.7499504089355,
-        "y": 2913.357632637024,
-        "z": "34265cd.7205424",
+        "x": 1791.7499351501465,
+        "y": 3010.3576288223267,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4013cdce.5ea73c"
+                "1f8e0939.c42ce7"
             ]
         ]
     },
     {
-        "id": "4013cdce.5ea73c",
+        "id": "1f8e0939.c42ce7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1982.0831718444824,
-        "y": 2913.3575048446655,
-        "z": "34265cd.7205424",
+        "x": 1945.0831565856934,
+        "y": 3010.3575010299683,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "903a3aca.3e3288",
-                "4a6e737f.7ebf6c",
-                "9291e114.ac1f58"
+                "695e43ac.61996c",
+                "dbb88684.a8701",
+                "c77499cc.02fca"
             ]
         ]
     },
     {
-        "id": "903a3aca.3e3288",
+        "id": "695e43ac.61996c",
         "type": "set",
         "name": "set vnf-network-index",
         "xml": "<set>\n<parameter name='vnf-network-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 2188.7500038146973,
-        "y": 2861.6908826828003,
-        "z": "34265cd.7205424",
+        "x": 2151.749988555908,
+        "y": 2958.690878868103,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "4a6e737f.7ebf6c",
+        "id": "dbb88684.a8701",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2143.7499198913574,
-        "y": 2951.690803527832,
-        "z": "34265cd.7205424",
+        "x": 2106.7499046325684,
+        "y": 3048.6907997131348,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "3f48cbb0.25141c",
+        "id": "25438028.49af4",
         "type": "switchNode",
         "name": "switch vnf-network-index",
         "xml": "<switch test='`$vnf-network-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1402.083339691162,
-        "y": 2975.0242204666138,
-        "z": "34265cd.7205424",
+        "x": 1365.083324432373,
+        "y": 3072.0242166519165,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b6265ed2.699af8"
+                "6ad7f58.4e60e0c"
             ]
         ]
     },
     {
-        "id": "b6265ed2.699af8",
+        "id": "6ad7f58.4e60e0c",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1593.7499809265137,
-        "y": 2975.0244646072388,
-        "z": "34265cd.7205424",
+        "x": 1556.7499656677246,
+        "y": 3072.0244607925415,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2ed011a8.f17046"
+                "cac91700.4c17"
             ]
         ]
     },
     {
-        "id": "2ed011a8.f17046",
+        "id": "cac91700.4c17",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1742.0831718444824,
-        "y": 2973.3575048446655,
-        "z": "34265cd.7205424",
+        "x": 1705.0831565856934,
+        "y": 3070.3575010299683,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4023444f.ec71fc",
-                "f3cab335.7ec9f"
+                "a8978c6d.0307c8",
+                "1980bda6.0907fa"
             ]
         ]
     },
     {
-        "id": "cc22dd63.414278",
+        "id": "7fe1eda3.4f3ee4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2433.7498893737793,
-        "y": 3383.357356071472,
-        "z": "34265cd.7205424",
+        "x": 2396.7498741149902,
+        "y": 3480.357352256775,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7043f864.7c537",
-                "4ca198d0.a53ec8",
-                "791dbcea.c3f15c"
+                "356bc551.3ec1ca",
+                "f041336a.316cd",
+                "1f14cd7.70cf733"
             ]
         ]
     },
     {
-        "id": "7043f864.7c537",
+        "id": "356bc551.3ec1ca",
         "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": 2630.4166412353516,
-        "y": 3338.3572750091553,
-        "z": "34265cd.7205424",
+        "x": 2593.4166259765625,
+        "y": 3435.357271194458,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "52062448.8dfe2c"
+                "82168895.ff1268"
             ]
         ]
     },
     {
-        "id": "52062448.8dfe2c",
+        "id": "82168895.ff1268",
         "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": 2857.083267211914,
-        "y": 3338.3572750091553,
-        "z": "34265cd.7205424",
+        "x": 2820.083251953125,
+        "y": 3435.357271194458,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "543cb01a.eba16"
+                "a740c25b.db367"
             ]
         ]
     },
     {
-        "id": "543cb01a.eba16",
+        "id": "a740c25b.db367",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3037.0832328796387,
-        "y": 3338.357681274414,
-        "z": "34265cd.7205424",
+        "x": 3000.0832176208496,
+        "y": 3435.357677459717,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bdf7e6b7.6ee818"
+                "80f988bb.accbc8"
             ]
         ]
     },
     {
-        "id": "60ebadf1.68a63c",
+        "id": "584966d1.c2c31",
         "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": 2462.083225250244,
-        "y": 3201.6907691955566,
-        "z": "34265cd.7205424",
+        "x": 2425.083209991455,
+        "y": 3298.6907653808594,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "400506a5.64a12",
+        "id": "5f865ea0.0676c",
         "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": 1907.083568572998,
-        "y": 3198.357804298401,
-        "z": "34265cd.7205424",
+        "x": 1870.083553314209,
+        "y": 3295.3578004837036,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e743e437.36a2c8",
-                "57980fd5.eb6b38",
-                "67a6a045.51b5d"
+                "6181e221.800f7c",
+                "b281bb18.f89538",
+                "c6664773.42391"
             ]
         ]
     },
     {
-        "id": "e743e437.36a2c8",
+        "id": "6181e221.800f7c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2108.7500801086426,
-        "y": 3098.3573474884033,
-        "z": "34265cd.7205424",
+        "x": 2071.7500648498535,
+        "y": 3195.357343673706,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "14f67782.825778"
+                "632ebb0f.6b72ec"
             ]
         ]
     },
     {
-        "id": "57980fd5.eb6b38",
+        "id": "b281bb18.f89538",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2105.1787109375,
-        "y": 3284.309638977051,
-        "z": "34265cd.7205424",
+        "x": 2068.178695678711,
+        "y": 3381.3096351623535,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "5396132e.ac2ccc"
+                "3a798a94.b1022e"
             ]
         ]
     },
     {
-        "id": "14f67782.825778",
+        "id": "632ebb0f.6b72ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2240.4166297912598,
-        "y": 3121.024094581604,
-        "z": "34265cd.7205424",
+        "x": 2203.4166145324707,
+        "y": 3218.0240907669067,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a683f1c3.23c0e",
+        "id": "2502e8d8.464bd",
         "type": "set",
         "name": "set subnet-id to -1",
         "xml": "<set>\n<parameter name='subnet-id' value='-1' />\n",
         "comments": "",
-        "x": 3130.417148590088,
-        "y": 3500.024761199951,
-        "z": "34265cd.7205424",
+        "x": 3093.417133331299,
+        "y": 3597.024757385254,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "5396132e.ac2ccc",
+        "id": "3a798a94.b1022e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2258.7501258850098,
-        "y": 3283.357271194458,
-        "z": "34265cd.7205424",
+        "x": 2221.7501106262207,
+        "y": 3380.3572673797607,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "60ebadf1.68a63c",
-                "cc22dd63.414278"
+                "584966d1.c2c31",
+                "7fe1eda3.4f3ee4"
             ]
         ]
     },
     {
-        "id": "8baea399.050c9",
+        "id": "c5140624.bb6f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4390.416746139526,
-        "y": 3671.6912381649017,
-        "z": "34265cd.7205424",
+        "x": 4353.416730880737,
+        "y": 3768.6912343502045,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2294588d.69be78",
-                "7cf89eba.e30e88"
+                "f25057b4.2e266",
+                "c542a135.ef0f5"
             ]
         ]
     },
     {
-        "id": "7cf89eba.e30e88",
+        "id": "c542a135.ef0f5",
         "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": 4605.416748046875,
-        "y": 3721.6909120082855,
-        "z": "34265cd.7205424",
+        "x": 4568.416732788086,
+        "y": 3818.6909081935883,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b43b85f4.a3f6f"
+                "ba13c0d4.a61928"
             ]
         ]
     },
     {
-        "id": "2294588d.69be78",
+        "id": "f25057b4.2e266",
         "type": "switchNode",
         "name": "switch tmp.address-family",
         "xml": "<switch test='`$tmp.address-family`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4607.083904266357,
-        "y": 3628.3578984737396,
-        "z": "34265cd.7205424",
+        "x": 4570.083889007568,
+        "y": 3725.3578946590424,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "594b959.c2361ec",
-                "9b3a3849.f2667"
+                "dc137b5d.faff98",
+                "837132a3.44baa"
             ]
         ]
     },
     {
-        "id": "594b959.c2361ec",
+        "id": "dc137b5d.faff98",
         "type": "outcome",
         "name": "ipv4",
         "xml": "<outcome value='ipv4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4810.417166392008,
-        "y": 3601.6911288102465,
-        "z": "34265cd.7205424",
+        "x": 4773.417151133219,
+        "y": 3698.691124995549,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6a520cb3.77f044"
+                "f7d6a129.7a1b8"
             ]
         ]
     },
     {
-        "id": "9b3a3849.f2667",
+        "id": "837132a3.44baa",
         "type": "outcome",
         "name": "ipv6",
         "xml": "<outcome value='ipv6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4810.416839599609,
-        "y": 3648.3576562404633,
-        "z": "34265cd.7205424",
+        "x": 4773.41682434082,
+        "y": 3745.357652425766,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7af13a32.5ffc94"
+                "2617d4d6.3cfd54"
             ]
         ]
     },
     {
-        "id": "6a520cb3.77f044",
+        "id": "f7d6a129.7a1b8",
         "type": "set",
         "name": "set ip-type parameter to IPv4",
         "xml": "<set>\n<parameter name='ip-type' value='IPv4' />\n",
         "comments": "",
-        "x": 5007.083652496338,
-        "y": 3600.024602651596,
-        "z": "34265cd.7205424",
+        "x": 4970.083637237549,
+        "y": 3697.024598836899,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "7af13a32.5ffc94",
+        "id": "2617d4d6.3cfd54",
         "type": "set",
         "name": "set ip-type parameter to IPv6",
         "xml": "<set>\n<parameter name='ip-type' value='IPv6' />\n",
         "comments": "",
-        "x": 5012.083530426025,
-        "y": 3648.3576753139496,
-        "z": "34265cd.7205424",
+        "x": 4975.083515167236,
+        "y": 3745.3576714992523,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "ab82723f.61758",
+        "id": "40290279.211ecc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4945.416778564453,
-        "y": 3721.3576753139496,
-        "z": "34265cd.7205424",
+        "x": 4908.416763305664,
+        "y": 3818.3576714992523,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b1e91b4.62d23e8",
-                "7d551750.2413e8"
+                "add111d3.22588",
+                "d03c05a2.3fa848"
             ]
         ]
     },
     {
-        "id": "b1e91b4.62d23e8",
+        "id": "add111d3.22588",
         "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": 5123.750099182129,
-        "y": 3698.024162054062,
-        "z": "34265cd.7205424",
+        "x": 5086.75008392334,
+        "y": 3795.0241582393646,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "7d551750.2413e8",
+        "id": "d03c05a2.3fa848",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5108.750102996826,
-        "y": 3744.6911561489105,
-        "z": "34265cd.7205424",
+        "x": 5071.750087738037,
+        "y": 3841.6911523342133,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "99f86360.f7c048",
+        "id": "9fc4555.7a3cfa8",
         "type": "switchNode",
         "name": "switch subnet-id",
         "xml": "<switch test='`$subnet-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3122.083023071289,
-        "y": 3661.6914958953857,
-        "z": "34265cd.7205424",
+        "x": 3085.0830078125,
+        "y": 3758.6914920806885,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3596c952.3e6b56"
+                "4688ca4f.b10a14"
             ]
         ]
     },
     {
-        "id": "3596c952.3e6b56",
+        "id": "4688ca4f.b10a14",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3278.7495880126953,
-        "y": 3661.691431045532,
-        "z": "34265cd.7205424",
+        "x": 3241.7495727539062,
+        "y": 3758.691427230835,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6bb9a9d2.d4614"
+                "1418484.c2e4038"
             ]
         ]
     },
     {
-        "id": "6bb9a9d2.d4614",
+        "id": "1418484.c2e4038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3427.082778930664,
-        "y": 3660.024471282959,
-        "z": "34265cd.7205424",
+        "x": 3390.082763671875,
+        "y": 3757.0244674682617,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1c39b653.2b576a",
-                "f3cab335.7ec9f"
+                "cb1415b6.cece5",
+                "1980bda6.0907fa"
             ]
         ]
     },
     {
-        "id": "5e59b7e1.f58dd8",
+        "id": "911a7c16.59a3f",
         "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": 3233.749668121338,
-        "y": 3738.3582668304443,
-        "z": "34265cd.7205424",
+        "x": 3196.749652862549,
+        "y": 3835.358263015747,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "fcdfebce.a935a8",
+        "id": "52376e41.5c3c28",
         "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": 587.0832633972168,
-        "y": 3333.3575048446655,
-        "z": "34265cd.7205424",
+        "x": 550.0832481384277,
+        "y": 3430.3575010299683,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b43b85f4.a3f6f",
+        "id": "ba13c0d4.a61928",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4792.083351135254,
-        "y": 3721.6914002895355,
-        "z": "34265cd.7205424",
+        "x": 4755.083335876465,
+        "y": 3818.6913964748383,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ab82723f.61758"
+                "40290279.211ecc"
             ]
         ]
     },
     {
-        "id": "9291e114.ac1f58",
+        "id": "c77499cc.02fca",
         "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": 2165.4165077209473,
-        "y": 2906.690965652466,
-        "z": "34265cd.7205424",
+        "x": 2128.416492462158,
+        "y": 3003.6909618377686,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "67190c0.7b4b2f4",
+        "id": "73fcbf14.3fdec",
         "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": 1363.7499732971191,
-        "y": 4521.6906933784485,
-        "z": "34265cd.7205424",
+        "x": 1326.74995803833,
+        "y": 4618.690689563751,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fbe686e0.5f0fd",
-                "957bd493.746db8"
+                "ce72c455.4b3538",
+                "d1d7edf9.9feb88"
             ]
         ]
     },
     {
-        "id": "fbe686e0.5f0fd",
+        "id": "ce72c455.4b3538",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1548.7499198913574,
-        "y": 4496.690512180328,
-        "z": "34265cd.7205424",
+        "x": 1511.7499046325684,
+        "y": 4593.690508365631,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "accede8.fdef6a"
+                "d9f4827a.0412b8"
             ]
         ]
     },
     {
-        "id": "957bd493.746db8",
+        "id": "d1d7edf9.9feb88",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.8451919555664,
-        "y": 4543.476339817047,
-        "z": "34265cd.7205424",
+        "x": 1509.8451766967773,
+        "y": 4640.47633600235,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3d2d20a5.318a68"
+                "22a96688.1f4e6a"
             ]
         ]
     },
     {
-        "id": "accede8.fdef6a",
+        "id": "d9f4827a.0412b8",
         "type": "set",
         "name": "set tmp.nfc-naming-code to DEFAULT",
         "xml": "<set>\n<parameter name='tmp.nfc-naming-code' value='DEFAULT' />\n",
         "comments": "",
-        "x": 1780.416690826416,
-        "y": 4495.023862361908,
-        "z": "34265cd.7205424",
+        "x": 1743.416675567627,
+        "y": 4592.023858547211,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "3d2d20a5.318a68",
+        "id": "22a96688.1f4e6a",
         "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": 1737.0832023620605,
-        "y": 4543.357360363007,
-        "z": "34265cd.7205424",
+        "x": 1700.0831871032715,
+        "y": 4640.357356548309,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "2591369f.6e45f2",
+        "id": "94b5136b.b8b098",
         "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": 1352.0833053588867,
-        "y": 4620.0238671302795,
-        "z": "34265cd.7205424",
+        "x": 1315.0832901000977,
+        "y": 4717.023863315582,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "db65fbda.8eb47",
-                "25e9a13b.27b69e"
+                "2ffbc916.fecb7e",
+                "e74db6e4.b95498"
             ]
         ]
     },
     {
-        "id": "db65fbda.8eb47",
+        "id": "2ffbc916.fecb7e",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1548.749912261963,
-        "y": 4595.0236649513245,
-        "z": "34265cd.7205424",
+        "x": 1511.7498970031738,
+        "y": 4692.023661136627,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "402342b6.e54cbc"
+                "6b879f7a.6f22e8"
             ]
         ]
     },
     {
-        "id": "25e9a13b.27b69e",
+        "id": "e74db6e4.b95498",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.8451843261719,
-        "y": 4641.809492588043,
-        "z": "34265cd.7205424",
+        "x": 1509.8451690673828,
+        "y": 4738.809488773346,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fc9c94e4.1cab6"
+                "176069ae.2f780e"
             ]
         ]
     },
     {
-        "id": "402342b6.e54cbc",
+        "id": "6b879f7a.6f22e8",
         "type": "set",
         "name": "set tmp.nfc-function to DEFAULT",
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='DEFAULT' />\n",
         "comments": "",
-        "x": 1760.4166946411133,
-        "y": 4593.356873989105,
-        "z": "34265cd.7205424",
+        "x": 1723.4166793823242,
+        "y": 4690.356870174408,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "fc9c94e4.1cab6",
+        "id": "176069ae.2f780e",
         "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": 1718.7498245239258,
-        "y": 4641.690535068512,
-        "z": "34265cd.7205424",
+        "x": 1681.7498092651367,
+        "y": 4738.690531253815,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "56804039.82c95",
+        "id": "f1babc88.16382",
         "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": 2025.4166221618652,
-        "y": 5518.690894603729,
-        "z": "34265cd.7205424",
+        "x": 1988.4166069030762,
+        "y": 5615.690890789032,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d7344243.b04a2"
+                "468a8949.ce6"
             ]
         ]
     },
     {
-        "id": "d7344243.b04a2",
+        "id": "468a8949.ce6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2223.7500915527344,
-        "y": 5518.358049869537,
-        "z": "34265cd.7205424",
+        "x": 2186.7500762939453,
+        "y": 5615.35804605484,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1b4d007d.b0d738"
+                "81279dea.3bc048"
             ]
         ]
     },
     {
-        "id": "a50b0d5a.ce5908",
+        "id": "8b1c560f.764dd",
         "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": 2028.7499656677246,
-        "y": 5678.357342243195,
-        "z": "34265cd.7205424",
+        "x": 1991.7499504089355,
+        "y": 5775.357338428497,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ecf473bc.4b56a8"
+                "90110945.ead0e"
             ]
         ]
     },
     {
-        "id": "ecf473bc.4b56a8",
+        "id": "90110945.ead0e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2227.0834350585938,
-        "y": 5678.024497509003,
-        "z": "34265cd.7205424",
+        "x": 2190.0834197998047,
+        "y": 5775.024493694305,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b14df7f0.70279"
+                "91124630.ba4798"
             ]
         ]
     },
     {
-        "id": "f2b022e3.1f756",
+        "id": "ddc96fa8.7a60c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1932.0832481384277,
-        "y": 6256.690762042999,
-        "z": "34265cd.7205424",
+        "x": 1895.0832328796387,
+        "y": 6353.690758228302,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "cd3cd499.458be8",
-                "8f630208.bc1d7"
+                "26b909fe.b46aae",
+                "5e6235d3.e2f47c"
             ]
         ]
     },
     {
-        "id": "d27afbea.8fdbb",
+        "id": "ea947930.9aa72",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1933.7499961853027,
-        "y": 6571.690773487091,
-        "z": "34265cd.7205424",
+        "x": 1896.7499809265137,
+        "y": 6668.690769672394,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "636270ad.cb1f1",
-                "8293c8c0.560c58"
+                "8bf7fa79.126fb",
+                "ee383b52.01d438"
             ]
         ]
     },
     {
-        "id": "8f630208.bc1d7",
+        "id": "5e6235d3.e2f47c",
         "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": 2148.7501945495605,
-        "y": 6315.023932933807,
-        "z": "34265cd.7205424",
+        "x": 2111.7501792907715,
+        "y": 6412.02392911911,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a6245c2f.d57048"
+                "c5614b8.e3a3a38"
             ]
         ]
     },
     {
-        "id": "c5f5f167.b223a",
+        "id": "19871893.cc9847",
         "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": 2823.7501182556152,
-        "y": 6315.023771762848,
-        "z": "34265cd.7205424",
+        "x": 2786.750102996826,
+        "y": 6412.023767948151,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "af4f9563.46c848",
-                "20889d25.78e392"
+                "4d809b52.05f224",
+                "6355c7af.050d9"
             ]
         ]
     },
     {
-        "id": "24613f9d.2d98c",
+        "id": "a3d18e25.19c118",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3215.583209991455,
-        "y": 6288.341553211212,
-        "z": "34265cd.7205424",
+        "x": 3178.583194732666,
+        "y": 6385.341549396515,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4923f1db.2fcc2",
-                "269063c8.ce5a84"
+                "fde5bb25.6eab78",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "215b3725.6db0e8",
+        "id": "10e03ab.3830ec5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3215.5832862854004,
-        "y": 6341.34131193161,
-        "z": "34265cd.7205424",
+        "x": 3178.5832710266113,
+        "y": 6438.341308116913,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "97a750a7.0acbc8",
-                "269063c8.ce5a84"
+                "66f00f4e.933f1",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "af4f9563.46c848",
+        "id": "4d809b52.05f224",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3058.7500953674316,
-        "y": 6288.357223033905,
-        "z": "34265cd.7205424",
+        "x": 3021.7500801086426,
+        "y": 6385.357219219208,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "24613f9d.2d98c"
+                "a3d18e25.19c118"
             ]
         ]
     },
     {
-        "id": "20889d25.78e392",
+        "id": "6355c7af.050d9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3067.3216285705566,
-        "y": 6340.976367473602,
-        "z": "34265cd.7205424",
+        "x": 3030.3216133117676,
+        "y": 6437.976363658905,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "215b3725.6db0e8"
+                "10e03ab.3830ec5"
             ]
         ]
     },
     {
-        "id": "8293c8c0.560c58",
+        "id": "ee383b52.01d438",
         "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": 2150.416591644287,
-        "y": 6638.357342243195,
-        "z": "34265cd.7205424",
+        "x": 2113.416576385498,
+        "y": 6735.357338428497,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "69d9fcf7.12a64c"
+                "8083303a.d06a3"
             ]
         ]
     },
     {
-        "id": "d0a7f2e0.3a2078",
+        "id": "61408d34.a74df4",
         "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": 2820.41654586792,
-        "y": 6636.690124988556,
-        "z": "34265cd.7205424",
+        "x": 2783.416530609131,
+        "y": 6733.690121173859,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "84935ce4.e84668",
-                "5e735e5d.b462a8"
+                "f01d7d25.2f7cb",
+                "2d4c9713.b3b4b"
             ]
         ]
     },
     {
-        "id": "32fbd7c1.249f1",
+        "id": "bd84552.fe7fe28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3212.2496376037598,
-        "y": 6610.00790643692,
-        "z": "34265cd.7205424",
+        "x": 3175.2496223449707,
+        "y": 6707.007902622223,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fc4213a2.47c98",
-                "269063c8.ce5a84"
+                "98387e99.104df8",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "d624a09c.620df",
+        "id": "55bd1a97.bc2b8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3212.249713897705,
-        "y": 6663.007665157318,
-        "z": "34265cd.7205424",
+        "x": 3175.249698638916,
+        "y": 6760.007661342621,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fd80fcb3.880c8",
-                "269063c8.ce5a84"
+                "819cfbd9.9a75b8",
+                "96fecd53.204d4"
             ]
         ]
     },
     {
-        "id": "84935ce4.e84668",
+        "id": "f01d7d25.2f7cb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3055.4165229797363,
-        "y": 6610.023576259613,
-        "z": "34265cd.7205424",
+        "x": 3018.4165077209473,
+        "y": 6707.023572444916,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "32fbd7c1.249f1"
+                "bd84552.fe7fe28"
             ]
         ]
     },
     {
-        "id": "5e735e5d.b462a8",
+        "id": "2d4c9713.b3b4b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3063.9880561828613,
-        "y": 6662.64272069931,
-        "z": "34265cd.7205424",
+        "x": 3026.9880409240723,
+        "y": 6759.642716884613,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d624a09c.620df"
+                "55bd1a97.bc2b8c"
             ]
         ]
     },
     {
-        "id": "a6245c2f.d57048",
+        "id": "c5614b8.e3a3a38",
         "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": 2402.083263397217,
-        "y": 6315.023609638214,
-        "z": "34265cd.7205424",
+        "x": 2365.0832481384277,
+        "y": 6412.023605823517,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "372012a9.b14566"
+                "5a9b0fe2.51ad78"
             ]
         ]
     },
     {
-        "id": "372012a9.b14566",
+        "id": "5a9b0fe2.51ad78",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2588.7501068115234,
-        "y": 6315.02409696579,
-        "z": "34265cd.7205424",
+        "x": 2551.7500915527344,
+        "y": 6412.0240931510925,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c5f5f167.b223a"
+                "19871893.cc9847"
             ]
         ]
     },
     {
-        "id": "69d9fcf7.12a64c",
+        "id": "8083303a.d06a3",
         "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": 2398.749843597412,
-        "y": 6636.690350055695,
-        "z": "34265cd.7205424",
+        "x": 2361.749828338623,
+        "y": 6733.690346240997,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fc024c49.f1c3f"
+                "34a7a8dc.e2f4c8"
             ]
         ]
     },
     {
-        "id": "fc024c49.f1c3f",
+        "id": "34a7a8dc.e2f4c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2585.4166870117188,
-        "y": 6636.69083738327,
-        "z": "34265cd.7205424",
+        "x": 2548.4166717529297,
+        "y": 6733.690833568573,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d0a7f2e0.3a2078"
+                "61408d34.a74df4"
             ]
         ]
     },
     {
-        "id": "1d4a09e3.74f01e",
+        "id": "1a648e8e.d27131",
         "type": "comment",
         "name": "SELF-SERVE FORK",
         "info": "",
         "comments": "",
-        "x": 748.4642944335938,
-        "y": 968.7976198196411,
-        "z": "34265cd.7205424",
+        "x": 711.4642791748047,
+        "y": 1065.7976160049438,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "bb6a45ed.04707",
+        "id": "4ee41069.1b1f68",
         "type": "comment",
         "name": "First, count the subnets for this address family",
         "info": "",
         "comments": "",
-        "x": 2763.750400543213,
-        "y": 3247.999765396118,
-        "z": "34265cd.7205424",
+        "x": 2726.750385284424,
+        "y": 3344.999761581421,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "b1ade774.cfc288",
+        "id": "8fa4cbde.d96c08",
         "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": 3137.0830879211426,
-        "y": 3543.000268936157,
-        "z": "34265cd.7205424",
+        "x": 3100.0830726623535,
+        "y": 3640.00026512146,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1d2a481b.bb5bc8"
+                "d467b1f.701725"
             ]
         ]
     },
     {
-        "id": "1d2a481b.bb5bc8",
+        "id": "d467b1f.701725",
         "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": 3363.749713897705,
-        "y": 3543.000268936157,
-        "z": "34265cd.7205424",
+        "x": 3326.749698638916,
+        "y": 3640.00026512146,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "79d9b537.c3936c"
+                "8bb6b15a.782b98"
             ]
         ]
     },
     {
-        "id": "79d9b537.c3936c",
+        "id": "8bb6b15a.782b98",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3543.7496795654297,
-        "y": 3543.000675201416,
-        "z": "34265cd.7205424",
+        "x": 3506.7496643066406,
+        "y": 3640.0006713867188,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d1d8beb4.cea2d8"
+                "698bc3f7.e95c9c"
             ]
         ]
     },
     {
-        "id": "4ca198d0.a53ec8",
+        "id": "f041336a.316cd",
         "type": "set",
         "name": "set af-count to 0",
         "xml": "<set>\n<parameter name='af-count' value='0' />\n",
         "comments": "",
-        "x": 2618.749973297119,
-        "y": 3289.6665172576904,
-        "z": "34265cd.7205424",
+        "x": 2581.74995803833,
+        "y": 3386.666513442993,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "70a514e0.1d9e4c",
+        "id": "d76c4f09.8e10b8",
         "type": "set",
         "name": "increment af-count",
         "xml": "<set>\n<parameter name='af-count' value='`$af-count + 1`' />\n",
         "comments": "",
-        "x": 3367.083339691162,
-        "y": 3356.333267211914,
-        "z": "34265cd.7205424",
+        "x": 3330.083324432373,
+        "y": 3453.333263397217,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "bdf7e6b7.6ee818",
+        "id": "80f988bb.accbc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3183.749713897705,
-        "y": 3337.999952316284,
-        "z": "34265cd.7205424",
+        "x": 3146.749698638916,
+        "y": 3434.999948501587,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "70a514e0.1d9e4c",
-                "5bb16a61.6e69bc"
+                "d76c4f09.8e10b8",
+                "1f44979a.e02c88"
             ]
         ]
     },
     {
-        "id": "5bb16a61.6e69bc",
+        "id": "1f44979a.e02c88",
         "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": 3348.7497596740723,
-        "y": 3311.3332653045654,
-        "z": "34265cd.7205424",
+        "x": 3311.749744415283,
+        "y": 3408.333261489868,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "791dbcea.c3f15c",
+        "id": "1f14cd7.70cf733",
         "type": "switchNode",
         "name": "switch af-count",
         "xml": "<switch test='`$af-count`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2608.750385284424,
-        "y": 3526.3334341049194,
-        "z": "34265cd.7205424",
+        "x": 2571.7503700256348,
+        "y": 3623.333430290222,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "ed47a0ef.b1bf78",
-                "79ae7762.a4525"
+                "16183673.7b26a2",
+                "30204a0d.e2b17e"
             ]
         ]
     },
     {
-        "id": "ed47a0ef.b1bf78",
+        "id": "16183673.7b26a2",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2768.7499046325684,
-        "y": 3424.666603088379,
-        "z": "34265cd.7205424",
+        "x": 2731.7498893737793,
+        "y": 3521.6665992736816,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "e053fb41.4c10f8"
+                "80e4ac5b.ed4d6"
             ]
         ]
     },
     {
-        "id": "e053fb41.4c10f8",
+        "id": "80e4ac5b.ed4d6",
         "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": 3042.083209991455,
-        "y": 3422.999952316284,
-        "z": "34265cd.7205424",
+        "x": 3005.083194732666,
+        "y": 3519.999948501587,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "79ae7762.a4525",
+        "id": "30204a0d.e2b17e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2768.7498207092285,
-        "y": 3626.333522796631,
-        "z": "34265cd.7205424",
+        "x": 2731.7498054504395,
+        "y": 3723.3335189819336,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f9e96cae.86b4f8"
+                "60bde60d.7fdc3"
             ]
         ]
     },
     {
-        "id": "f9e96cae.86b4f8",
+        "id": "60bde60d.7fdc3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2925.41646194458,
-        "y": 3626.333204269409,
-        "z": "34265cd.7205424",
+        "x": 2888.416446685791,
+        "y": 3723.333200454712,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a683f1c3.23c0e",
-                "b1ade774.cfc288",
-                "99f86360.f7c048",
-                "5e59b7e1.f58dd8"
+                "2502e8d8.464bd",
+                "8fa4cbde.d96c08",
+                "9fc4555.7a3cfa8",
+                "911a7c16.59a3f"
             ]
         ]
     },
     {
-        "id": "d1d8beb4.cea2d8",
+        "id": "698bc3f7.e95c9c",
         "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": 3738.749858856201,
-        "y": 3541.3335189819336,
-        "z": "34265cd.7205424",
+        "x": 3701.749843597412,
+        "y": 3638.3335151672363,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "2066aba2.d3bb4c",
-                "f3e101cd.85b1b8"
+                "319a767b.d617b2",
+                "ccaed42d.bbe328"
             ]
         ]
     },
     {
-        "id": "2066aba2.d3bb4c",
+        "id": "319a767b.d617b2",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 3935.416706085205,
-        "y": 3476.333129644394,
-        "z": "34265cd.7205424",
+        "x": 3898.416690826416,
+        "y": 3573.3331258296967,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c6a0914d.3826e8"
+                "8b1ae825.01b258"
             ]
         ]
     },
     {
-        "id": "f3e101cd.85b1b8",
+        "id": "ccaed42d.bbe328",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3928.512104034424,
-        "y": 3610.6190412044525,
-        "z": "34265cd.7205424",
+        "x": 3891.5120887756348,
+        "y": 3707.6190373897552,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "4cd6ad1.9e140d4"
+                "e6e8901e.ce83d8"
             ]
         ]
     },
     {
-        "id": "4cd6ad1.9e140d4",
+        "id": "e6e8901e.ce83d8",
         "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": 4083.749897003174,
-        "y": 3609.6662480831146,
-        "z": "34265cd.7205424",
+        "x": 4046.7498817443848,
+        "y": 3706.6662442684174,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f5b0bc14.89cdb8",
-                "78b8442f.309bb4"
+                "32f80f7a.7278e",
+                "5d27e1c1.0a5b88"
             ]
         ]
     },
     {
-        "id": "f5b0bc14.89cdb8",
+        "id": "32f80f7a.7278e",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 4238.749973297119,
-        "y": 3539.66654753685,
-        "z": "34265cd.7205424",
+        "x": 4201.74995803833,
+        "y": 3636.6665437221527,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "892836a6.bb30b8"
+                "fe4ceb3b.c7ac88"
             ]
         ]
     },
     {
-        "id": "78b8442f.309bb4",
+        "id": "5d27e1c1.0a5b88",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4241.845769882202,
-        "y": 3672.2856347560883,
-        "z": "34265cd.7205424",
+        "x": 4204.845754623413,
+        "y": 3769.285630941391,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8baea399.050c9"
+                "c5140624.bb6f"
             ]
         ]
     },
     {
-        "id": "67a6a045.51b5d",
+        "id": "c6664773.42391",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>",
         "comments": "",
         "outputs": 1,
-        "x": 2110.4165840148926,
-        "y": 3146.333204269409,
-        "z": "34265cd.7205424",
+        "x": 2073.4165687561035,
+        "y": 3243.333200454712,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "14f67782.825778"
+                "632ebb0f.6b72ec"
             ]
         ]
     },
     {
-        "id": "c6a0914d.3826e8",
+        "id": "8b1ae825.01b258",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4080.416633605957,
-        "y": 3476.3328969478607,
-        "z": "34265cd.7205424",
+        "x": 4043.416618347168,
+        "y": 3573.3328931331635,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "38e6ba0e.ecd3ae",
-                "f3cab335.7ec9f"
+                "cb15322d.db07d8",
+                "1980bda6.0907fa"
             ]
         ]
     },
     {
-        "id": "892836a6.bb30b8",
+        "id": "fe4ceb3b.c7ac88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4385.416488647461,
-        "y": 3537.9997642040253,
-        "z": "34265cd.7205424",
+        "x": 4348.416473388672,
+        "y": 3634.999760389328,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "5e50004f.2c9f",
-                "f3cab335.7ec9f"
+                "7d616bdb.daafe4",
+                "1980bda6.0907fa"
             ]
         ]
     },
     {
-        "id": "eafa8b76.275b48",
+        "id": "66035d73.07c344",
         "type": "comment",
         "name": "Ignore address families with no addresses",
         "info": "",
         "comments": "",
-        "x": 2384.74995803833,
-        "y": 3076.666700363159,
-        "z": "34265cd.7205424",
+        "x": 2347.749942779541,
+        "y": 3173.666696548462,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "f5615f88.05ae28",
+        "id": "c3cf109b.3ee48",
         "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": 1355.4167976379395,
-        "y": 4706.333078384399,
-        "z": "34265cd.7205424",
+        "x": 1318.4167823791504,
+        "y": 4803.333074569702,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "32f079b9.ff27d6",
-                "1e96f66.5d21f8a"
+                "1816f4a4.8ea5ab",
+                "faa47b4f.e3b78"
             ]
         ]
     },
     {
-        "id": "32f079b9.ff27d6",
+        "id": "1816f4a4.8ea5ab",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1537.083209991455,
-        "y": 4682.999708175659,
-        "z": "34265cd.7205424",
+        "x": 1500.083194732666,
+        "y": 4779.999704360962,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f9cc9731.038f7"
+                "927d4431.204cf"
             ]
         ]
     },
     {
-        "id": "1e96f66.5d21f8a",
+        "id": "faa47b4f.e3b78",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1535.178482055664,
-        "y": 4729.785535812378,
-        "z": "34265cd.7205424",
+        "x": 1498.178466796875,
+        "y": 4826.785531997681,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c87af5c.2b49f88"
+                "486da9cb.5e0db"
             ]
         ]
     },
     {
-        "id": "f9cc9731.038f7",
+        "id": "927d4431.204cf",
         "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": 1698.7498359680176,
-        "y": 4684.666700363159,
-        "z": "34265cd.7205424",
+        "x": 1661.7498207092285,
+        "y": 4781.666696548462,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "d4c69512.b7a85",
-                "cb5ae333.4bb6c"
+                "ed23263a.02e4b",
+                "fd219437.f0a108"
             ]
         ]
     },
     {
-        "id": "a6f8df46.880ce8",
+        "id": "32e92ddc.ae5c1a",
         "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": 614.4641952514648,
-        "y": 358.65472888946533,
-        "z": "34265cd.7205424",
+        "x": 577.4641799926758,
+        "y": 455.65472507476807,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "6677fe8a.aff6a",
-                "6295c766.2daaa8"
+                "6af710a4.0530e8",
+                "2bef5348.d878fc"
             ]
         ]
     },
     {
-        "id": "6677fe8a.aff6a",
+        "id": "6af710a4.0530e8",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 797.7975692749023,
-        "y": 328.65471744537354,
-        "z": "34265cd.7205424",
+        "x": 760.7975540161133,
+        "y": 425.65471363067627,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "39261ade.66ad8e"
+                "53f56a83.697074"
             ]
         ]
     },
     {
-        "id": "6295c766.2daaa8",
+        "id": "2bef5348.d878fc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 797.5594749450684,
-        "y": 369.6072111129761,
-        "z": "34265cd.7205424",
+        "x": 760.5594596862793,
+        "y": 466.6072072982788,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "a2677766.fe3f"
+                "cd4db176.affc4"
             ]
         ]
     },
     {
-        "id": "39261ade.66ad8e",
+        "id": "53f56a83.697074",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 932.7975234985352,
-        "y": 326.98805713653564,
-        "z": "34265cd.7205424",
+        "x": 895.7975082397461,
+        "y": 423.9880533218384,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2677766.fe3f",
+        "id": "cd4db176.affc4",
         "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": 1014.4641799926758,
-        "y": 368.6547384262085,
-        "z": "34265cd.7205424",
+        "x": 977.4641647338867,
+        "y": 465.65473461151123,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "d918a5d3.4b678",
+        "id": "bb29ba7b.f486c",
         "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": 646.0515670776367,
-        "y": 910.048059463501,
-        "z": "34265cd.7205424",
+        "x": 609.0515518188477,
+        "y": 1007.0480556488037,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7933c6b5.bef96",
+        "id": "ac910a9d.5490c8",
         "type": "switchNode",
         "name": "switch ss.self-serve-flag",
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 604.1943054199219,
-        "y": 1137.0481281280518,
-        "z": "34265cd.7205424",
+        "x": 567.1942901611328,
+        "y": 1234.0481243133545,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "aa4d9d31.8db2d",
-                "8b34e2b6.f12a5"
+                "4dc0eb9c.507774",
+                "edaf5038.5b0c1"
             ]
         ]
     },
     {
-        "id": "aa4d9d31.8db2d",
+        "id": "4dc0eb9c.507774",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 824.908504486084,
-        "y": 1254.6190271377563,
-        "z": "34265cd.7205424",
+        "x": 787.9084892272949,
+        "y": 1351.619023323059,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b2cbded2.837b2"
+                "b209b55a.0520c"
             ]
         ]
     },
     {
-        "id": "8b34e2b6.f12a5",
+        "id": "edaf5038.5b0c1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 825.4799575805664,
-        "y": 1013.4766645431519,
-        "z": "34265cd.7205424",
+        "x": 788.4799423217773,
+        "y": 1110.4766607284546,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "be10b89.7317448"
+                "c72ffbe.21eac88"
             ]
         ]
     },
     {
-        "id": "66d0262b.c1316",
+        "id": "6e1b2ed4.8fd6b8",
         "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": 657.2499923706055,
-        "y": 7316.2509298324585,
-        "z": "34265cd.7205424",
+        "x": 620.2499771118164,
+        "y": 7413.250926017761,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b097fd2d.1c3e2",
+        "id": "bdff604f.42ef3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 979.9999618530273,
-        "y": 487.6302709579468,
-        "z": "34265cd.7205424",
+        "x": 942.9999465942383,
+        "y": 584.6302671432495,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "7e3f0173.cdd7c8",
-                "52adbd59.e3948c"
+                "bac0765.fd1d008",
+                "3e420238.62f4c6"
             ]
         ]
     },
     {
-        "id": "52adbd59.e3948c",
+        "id": "3e420238.62f4c6",
         "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": 1167.9166450500488,
-        "y": 471.26124906539917,
-        "z": "34265cd.7205424",
+        "x": 1130.9166297912598,
+        "y": 568.2612452507019,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b23f970.b0e516",
+        "id": "a8481a22.9610b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1082.2022666931152,
-        "y": 536.1183648109436,
-        "z": "34265cd.7205424",
+        "x": 1045.2022514343262,
+        "y": 633.1183609962463,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "fd16e118.302da8",
-                "7e3f0173.cdd7c8"
+                "8f2747d2.b35a78",
+                "bac0765.fd1d008"
             ]
         ]
     },
     {
-        "id": "fd16e118.302da8",
+        "id": "8f2747d2.b35a78",
         "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": 1279.5236701965332,
-        "y": 514.6540641784668,
-        "z": "34265cd.7205424",
+        "x": 1242.5236549377441,
+        "y": 611.6540603637695,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "19ca61b5.8fa5c6",
+        "id": "12fc934c.3bd04d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1096.4879722595215,
-        "y": 581.2612175941467,
-        "z": "34265cd.7205424",
+        "x": 1059.4879570007324,
+        "y": 678.2612137794495,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "cb67a353.3c75b",
-                "7e3f0173.cdd7c8"
+                "6cfbe00a.c48468",
+                "bac0765.fd1d008"
             ]
         ]
     },
     {
-        "id": "cb67a353.3c75b",
+        "id": "6cfbe00a.c48468",
         "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": 1291.130859375,
-        "y": 558.2255039215088,
-        "z": "34265cd.7205424",
+        "x": 1254.130844116211,
+        "y": 655.2255001068115,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "57fdbbee.7122f4",
+        "id": "b40ea227.e7972",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1058.095230102539,
-        "y": 709.3326988220215,
-        "z": "34265cd.7205424",
+        "x": 1021.09521484375,
+        "y": 806.3326950073242,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f134d1f3.94396",
-                "7e3f0173.cdd7c8"
+                "4f3db911.0a293",
+                "bac0765.fd1d008"
             ]
         ]
     },
     {
-        "id": "f134d1f3.94396",
+        "id": "4f3db911.0a293",
         "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": 1265.0594863891602,
-        "y": 680.3684234619141,
-        "z": "34265cd.7205424",
+        "x": 1228.059471130371,
+        "y": 777.3684196472168,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a0d2ddbe.4ce55",
+        "id": "5cd79a68.a802ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 922.3809356689453,
-        "y": 817.3326988220215,
-        "z": "34265cd.7205424",
+        "x": 885.3809204101562,
+        "y": 914.3326950073242,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "bb2e5ad9.46ca68",
-                "7e3f0173.cdd7c8"
+                "866d0c00.2ab2",
+                "bac0765.fd1d008"
             ]
         ]
     },
     {
-        "id": "bb2e5ad9.46ca68",
+        "id": "866d0c00.2ab2",
         "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": 1124.345230102539,
-        "y": 792.6898679733276,
-        "z": "34265cd.7205424",
+        "x": 1087.34521484375,
+        "y": 889.6898641586304,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b91cfedb.3fa03",
+        "id": "58bfc070.0570d8",
         "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": 1247.3325996398926,
-        "y": 926.1062297821045,
-        "z": "34265cd.7205424",
+        "x": 1210.3325843811035,
+        "y": 1023.1062259674072,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "70c27670.277bc"
+                "d28cd7af.2db2a8"
             ]
         ]
     },
     {
-        "id": "70c27670.277bc",
+        "id": "d28cd7af.2db2a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1467.6301803588867,
-        "y": 925.5942611694336,
-        "z": "34265cd.7205424",
+        "x": 1430.6301651000977,
+        "y": 1022.5942573547363,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "adee9682.834c08"
+                "dbee4993.a7efc8"
             ]
         ]
     },
     {
-        "id": "2b74d386.947184",
+        "id": "9f93468d.33b288",
         "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": 1200.035270690918,
-        "y": 1171.367787361145,
-        "z": "34265cd.7205424",
+        "x": 1163.035255432129,
+        "y": 1268.3677835464478,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "f3642c27.ec6008",
+        "id": "b8c19138.abe93",
         "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": 1186.2494812011719,
-        "y": 1017.1094055175781,
-        "z": "34265cd.7205424",
+        "x": 1149.2494659423828,
+        "y": 1114.1094017028809,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d714905.ce5a3f",
+        "id": "62bf18c3.b6afd8",
         "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": 1255.2732429504395,
-        "y": 971.0702590942383,
-        "z": "34265cd.7205424",
+        "x": 1218.2732276916504,
+        "y": 1068.070255279541,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "be10b89.7317448",
+        "id": "c72ffbe.21eac88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 996.3687133789062,
-        "y": 1012.5700912475586,
-        "z": "34265cd.7205424",
+        "x": 959.3686981201172,
+        "y": 1109.5700874328613,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b91cfedb.3fa03",
-                "d714905.ce5a3f",
-                "f3642c27.ec6008",
-                "2b74d386.947184",
-                "57df4d97.1b3e74",
-                "60730953.c387"
+                "58bfc070.0570d8",
+                "62bf18c3.b6afd8",
+                "b8c19138.abe93",
+                "9f93468d.33b288",
+                "b7e13818.1bbbd",
+                "f83606b1.57aa68"
             ]
         ]
     },
     {
-        "id": "7e3f0173.cdd7c8",
+        "id": "bac0765.fd1d008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1706.5477905273438,
-        "y": 1193.904673576355,
-        "z": "34265cd.7205424",
+        "x": 1669.5477752685547,
+        "y": 1290.9046697616577,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "78f1021d.4797bc",
-                "d65a69c8.cf6ba"
+                "50c201dc.9bc778",
+                "adbc50ce.7d37f"
             ]
         ]
     },
     {
-        "id": "adee9682.834c08",
+        "id": "dbee4993.a7efc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1613.6309051513672,
-        "y": 924.9756164550781,
-        "z": "34265cd.7205424",
+        "x": 1576.6308898925781,
+        "y": 1021.9756126403809,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "f38280a4.feb028",
-                "7e3f0173.cdd7c8"
+                "dece85a0.4a47e",
+                "bac0765.fd1d008"
             ]
         ]
     },
     {
-        "id": "f38280a4.feb028",
+        "id": "dece85a0.4a47e",
         "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": 1811.3096618652344,
-        "y": 904.2613258361816,
-        "z": "34265cd.7205424",
+        "x": 1774.3096466064453,
+        "y": 1001.2613220214844,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "41d32aa.5f68754",
+        "id": "39450462.cb0f84",
         "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": 2518.750015258789,
-        "y": 1423.4688367843628,
-        "z": "34265cd.7205424",
+        "x": 2481.75,
+        "y": 1520.4688329696655,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "bdb7e590.4bbf98",
+        "id": "2a30af16.7b82",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2324.8211059570312,
-        "y": 1442.9331254959106,
-        "z": "34265cd.7205424",
+        "x": 2287.821090698242,
+        "y": 1539.9331216812134,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "41d32aa.5f68754",
-                "1d6f9b4e.71254d"
+                "39450462.cb0f84",
+                "8964842b.6432c8"
             ]
         ]
     },
     {
-        "id": "e750571d.ca626",
+        "id": "7e580eff.038e2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1029.8213348388672,
-        "y": 1660.5997676849365,
-        "z": "34265cd.7205424",
+        "x": 992.8213195800781,
+        "y": 1757.5997638702393,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "1a7b6a78.6a325e",
-                "1d6f9b4e.71254d"
+                "d95a6d03.0b146",
+                "8964842b.6432c8"
             ]
         ]
     },
     {
-        "id": "71cefe31.79b508",
+        "id": "caeb64b7.ba2878",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1031.488021850586,
-        "y": 1703.933141708374,
-        "z": "34265cd.7205424",
+        "x": 994.4880065917969,
+        "y": 1800.9331378936768,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "808569e9.5d9618",
-                "1d6f9b4e.71254d"
+                "6195cb44.48d0f4",
+                "8964842b.6432c8"
             ]
         ]
     },
     {
-        "id": "1a7b6a78.6a325e",
+        "id": "d95a6d03.0b146",
         "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": 1233.75,
-        "y": 1637.3855438232422,
-        "z": "34265cd.7205424",
+        "x": 1196.749984741211,
+        "y": 1734.385540008545,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "808569e9.5d9618",
+        "id": "6195cb44.48d0f4",
         "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": 1229.1667404174805,
-        "y": 1685.7188806533813,
-        "z": "34265cd.7205424",
+        "x": 1192.1667251586914,
+        "y": 1782.718876838684,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b8167ac.ee8e3",
+        "id": "42e790a.f88747",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 914.4045486450195,
-        "y": 1884.599820137024,
-        "z": "34265cd.7205424",
+        "x": 877.4045333862305,
+        "y": 1981.5998163223267,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b31a2d90.6e6418",
-                "1d6f9b4e.71254d"
+                "69f063a.3b46c9c",
+                "8964842b.6432c8"
             ]
         ]
     },
     {
-        "id": "b31a2d90.6e6418",
+        "id": "69f063a.3b46c9c",
         "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": 1107.0832061767578,
-        "y": 1857.3855504989624,
-        "z": "34265cd.7205424",
+        "x": 1070.0831909179688,
+        "y": 1954.3855466842651,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d6f9b4e.71254d",
+        "id": "8964842b.6432c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1708.5714492797852,
-        "y": 2145.540556907654,
-        "z": "34265cd.7205424",
+        "x": 1671.571434020996,
+        "y": 2242.5405530929565,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "caca347e.8787d",
-                "a38241eb.287ec8"
+                "3728e3f3.742a9c",
+                "3312acbf.c98b04"
             ]
         ]
     },
     {
-        "id": "20ed866d.bb0ce2",
+        "id": "6152a91e.e447b",
         "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": 2823.74991607666,
-        "y": 2633.7741470336914,
-        "z": "34265cd.7205424",
+        "x": 2786.749900817871,
+        "y": 2730.774143218994,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "9af3e55f.6087e",
+        "id": "fddcb313.1cf958",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2441.011405944824,
-        "y": 2684.19135761261,
-        "z": "34265cd.7205424",
+        "x": 2404.011390686035,
+        "y": 2781.1913537979126,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "20ed866d.bb0ce2",
-                "9ea0a8d5.338e78",
-                "bb2b8a64.4eda98"
+                "6152a91e.e447b",
+                "d8f50cf3.b660b8",
+                "7e407330.b6b2bc"
             ]
         ]
     },
     {
-        "id": "b201b2ed.f32f68",
+        "id": "8d60dce.3fe77a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3002.083209991455,
-        "y": 2324.524369239807,
-        "z": "34265cd.7205424",
+        "x": 2965.083194732666,
+        "y": 2421.52436542511,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "c392950a.4cd7e",
-                "9af3e55f.6087e"
+                "61ebd127.67b2b",
+                "fddcb313.1cf958"
             ]
         ]
     },
     {
-        "id": "c392950a.4cd7e",
+        "id": "61ebd127.67b2b",
         "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": 3201.6664505004883,
-        "y": 2291.1673135757446,
-        "z": "34265cd.7205424",
+        "x": 3164.666435241699,
+        "y": 2388.1673097610474,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "886e3c52.8c2238",
+        "id": "59ff4e4b.8c6b68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2173.987762451172,
-        "y": 2472.1076765060425,
-        "z": "34265cd.7205424",
+        "x": 2136.987747192383,
+        "y": 2569.107672691345,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3be3b1ce.879d46",
-                "9af3e55f.6087e"
+                "9b4ca4c4.41e2c8",
+                "fddcb313.1cf958"
             ]
         ]
     },
     {
-        "id": "3be3b1ce.879d46",
+        "id": "9b4ca4c4.41e2c8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving preload-information\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2379.999870300293,
-        "y": 2446.750412940979,
-        "z": "34265cd.7205424",
+        "x": 2342.999855041504,
+        "y": 2543.7504091262817,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b6c26cf.773831",
+        "id": "59263ccb.02e03c",
         "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": 4247.083518981934,
-        "y": 4512.246376037598,
-        "z": "34265cd.7205424",
+        "x": 4210.0835037231445,
+        "y": 4609.2463722229,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f3cab335.7ec9f",
+        "id": "1980bda6.0907fa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3859.3447341918945,
-        "y": 4558.913317203522,
-        "z": "34265cd.7205424",
+        "x": 3822.3447189331055,
+        "y": 4655.9133133888245,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b6c26cf.773831",
-                "3a601dac.7a4482",
-                "aee71bd7.cb4458"
+                "59263ccb.02e03c",
+                "15beb6ed.58fac9",
+                "98fe2567.5c7fd"
             ]
         ]
     },
     {
-        "id": "4023444f.ec71fc",
+        "id": "a8978c6d.0307c8",
         "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": 1942.0833206176758,
-        "y": 2955.718928337097,
-        "z": "34265cd.7205424",
+        "x": 1905.0833053588867,
+        "y": 3052.7189245224,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "38e6ba0e.ecd3ae",
+        "id": "cb15322d.db07d8",
         "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": 4271.666809082031,
-        "y": 3431.413005590439,
-        "z": "34265cd.7205424",
+        "x": 4234.666793823242,
+        "y": 3528.4130017757416,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e50004f.2c9f",
+        "id": "7d616bdb.daafe4",
         "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": 4586.666831970215,
-        "y": 3508.9130125045776,
-        "z": "34265cd.7205424",
+        "x": 4549.666816711426,
+        "y": 3605.9130086898804,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c39b653.2b576a",
+        "id": "cb1415b6.cece5",
         "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": 3634.1667861938477,
-        "y": 3628.9130296707153,
-        "z": "34265cd.7205424",
+        "x": 3597.1667709350586,
+        "y": 3725.913025856018,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4e308ce.5712b",
+        "id": "e1550da4.520918",
         "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": 2074.861038208008,
-        "y": 3865.441397666931,
-        "z": "34265cd.7205424",
+        "x": 2037.8610229492188,
+        "y": 3962.441393852234,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1873883.a0b338",
+        "id": "7b08fad7.a132ec",
         "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": 2882.361099243164,
-        "y": 4050.4411458969116,
-        "z": "34265cd.7205424",
+        "x": 2845.361083984375,
+        "y": 4147.441142082214,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "64b6a50b.0e40cc",
+        "id": "ce58c07c.b817d",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error saving vnfc to AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2258.7499465942383,
-        "y": 4673.080787658691,
-        "z": "34265cd.7205424",
+        "x": 2221.749931335449,
+        "y": 4770.080783843994,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8f70cec.245ee",
+        "id": "c7eb84c5.f0e708",
         "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": 3735.555435180664,
-        "y": 5868.081328392029,
-        "z": "34265cd.7205424",
+        "x": 3698.555419921875,
+        "y": 5965.0813245773315,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "deea8b7a.34ee38",
+        "id": "387bacc5.df1d84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3349.066925048828,
-        "y": 5910.998540878296,
-        "z": "34265cd.7205424",
+        "x": 3312.066909790039,
+        "y": 6007.998537063599,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b8f70cec.245ee",
-                "c7108bf6.17f21",
-                "eb62798f.37c47"
+                "c7eb84c5.f0e708",
+                "e35102b5.ead4c",
+                "62bbfbdf.d34f3c"
             ]
         ]
     },
     {
-        "id": "ecec95d0.f03d18",
+        "id": "8a14b675.cd4478",
         "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": 1896.09130859375,
-        "y": 4786.83000087738,
-        "z": "34265cd.7205424",
+        "x": 1859.091293334961,
+        "y": 4883.829997062683,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b5a4f9a.72aaf8",
+        "id": "b8157190.3209b8",
         "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": 1895.5556297302246,
-        "y": 4843.794567108154,
-        "z": "34265cd.7205424",
+        "x": 1858.5556144714355,
+        "y": 4940.794563293457,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "56c543eb.6150dc",
+        "id": "3296dfd.dbc53a",
         "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": 2338.055639266968,
-        "y": 5013.080267906189,
-        "z": "34265cd.7205424",
+        "x": 2301.0556240081787,
+        "y": 5110.080264091492,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d01f264c.61c318",
+        "id": "804becc1.78da28",
         "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": 2993.0557022094727,
-        "y": 5465.302522659302,
-        "z": "34265cd.7205424",
+        "x": 2956.0556869506836,
+        "y": 5562.3025188446045,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "64482d7f.371044",
+        "id": "7e2874de.0ebfec",
         "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": 2995.5557022094727,
-        "y": 5527.802525520325,
-        "z": "34265cd.7205424",
+        "x": 2958.5556869506836,
+        "y": 5624.802521705627,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a163627.fcef3",
+        "id": "9d950f64.0102",
         "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": 3324.1273040771484,
-        "y": 5625.302538871765,
-        "z": "34265cd.7205424",
+        "x": 3287.1272888183594,
+        "y": 5722.302535057068,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "57dc1477.8da4b4",
+        "id": "b2d45985.f53aa8",
         "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": 3326.6274032592773,
-        "y": 5687.802539825439,
-        "z": "34265cd.7205424",
+        "x": 3289.6273880004883,
+        "y": 5784.802536010742,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7be1c39.6ee63",
+        "id": "c5ce8f8a.5c8cc",
         "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": 4015.9730072021484,
-        "y": 5096.552495002747,
-        "z": "34265cd.7205424",
+        "x": 3978.9729919433594,
+        "y": 5193.552491188049,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4494b11.30c988",
+        "id": "d6d217c2.575b08",
         "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": 4013.4730072021484,
-        "y": 5175.3025007247925,
-        "z": "34265cd.7205424",
+        "x": 3976.4729919433594,
+        "y": 5272.302496910095,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b6a1bff.11e25c",
+        "id": "eacb1b8b.899fc",
         "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": 4015.97274017334,
-        "y": 5235.302507400513,
-        "z": "34265cd.7205424",
+        "x": 3978.972724914551,
+        "y": 5332.302503585815,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d21480c.1addf8",
+        "id": "e1c04fe9.9abb6",
         "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": 4019.7227478027344,
-        "y": 5285.302512168884,
-        "z": "34265cd.7205424",
+        "x": 3982.7227325439453,
+        "y": 5382.302508354187,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3d10ed9.82b7b8",
+        "id": "b00c290a.190b9",
         "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": 4018.472480773926,
-        "y": 5346.552515029907,
-        "z": "34265cd.7205424",
+        "x": 3981.4724655151367,
+        "y": 5443.55251121521,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "fedf80c9.88e5f",
+        "id": "f9dafb05.46c9b",
         "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": 4019.722480773926,
-        "y": 5406.5525159835815,
-        "z": "34265cd.7205424",
+        "x": 3982.7224655151367,
+        "y": 5503.552512168884,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "aee903cd.9f721",
+        "id": "cf7438ea.85212",
         "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": 4429.722415924072,
-        "y": 5532.802444458008,
-        "z": "34265cd.7205424",
+        "x": 4392.722400665283,
+        "y": 5629.802440643311,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8d50b6.e90cc78",
+        "id": "4f9c607a.ce1c88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4049.483901977539,
-        "y": 5577.469656944275,
-        "z": "34265cd.7205424",
+        "x": 4012.48388671875,
+        "y": 5674.469653129578,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "aee903cd.9f721",
-                "28125649.296d72",
-                "a39b4b61.59b038"
+                "cf7438ea.85212",
+                "a33ba8b8.1d7cc",
+                "de495219.3e8f9"
             ]
         ]
     },
     {
-        "id": "8395e0d5.a4ecb8",
+        "id": "26a60a34.f6645e",
         "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": 3853.1943283081055,
-        "y": 6997.246689796448,
-        "z": "34265cd.7205424",
+        "x": 3816.1943130493164,
+        "y": 7094.2466859817505,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "269063c8.ce5a84",
+        "id": "96fecd53.204d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3465.455551147461,
-        "y": 7047.663359642029,
-        "z": "34265cd.7205424",
+        "x": 3428.455535888672,
+        "y": 7144.6633558273315,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "8395e0d5.a4ecb8",
-                "8d26e950.2b598",
-                "a7b746c4.2d389"
+                "26a60a34.f6645e",
+                "ac95a18e.e9d4e8",
+                "23f95643.5a124a"
             ]
         ]
     },
     {
-        "id": "fd80fcb3.880c8",
+        "id": "819cfbd9.9a75b8",
         "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": 3403.194622039795,
-        "y": 6635.996907234192,
-        "z": "34265cd.7205424",
+        "x": 3366.194606781006,
+        "y": 6732.996903419495,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc4213a2.47c98",
+        "id": "98387e99.104df8",
         "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": 3396.944892883301,
-        "y": 6572.247441291809,
-        "z": "34265cd.7205424",
+        "x": 3359.9448776245117,
+        "y": 6669.247437477112,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "97a750a7.0acbc8",
+        "id": "66f00f4e.933f1",
         "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": 3408.194625854492,
-        "y": 6323.496886253357,
-        "z": "34265cd.7205424",
+        "x": 3371.194610595703,
+        "y": 6420.49688243866,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "4923f1db.2fcc2",
+        "id": "fde5bb25.6eab78",
         "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": 3408.194892883301,
-        "y": 6262.247422218323,
-        "z": "34265cd.7205424",
+        "x": 3371.1948776245117,
+        "y": 6359.2474184036255,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "84c51507.94d668",
+        "id": "131ea97.a877f57",
         "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": 2775.6945877075195,
-        "y": 6523.496897697449,
-        "z": "34265cd.7205424",
+        "x": 2738.6945724487305,
+        "y": 6620.4968938827515,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "4a19d7b6.f2c47",
+        "id": "7345e678.7bf88",
         "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": 2774.444580078125,
-        "y": 6465.997433662415,
-        "z": "34265cd.7205424",
+        "x": 2737.444564819336,
+        "y": 6562.997429847717,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "48c2cba4.91f6cc",
+        "id": "3bd1f48b.4c0b2c",
         "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": 2438.194564819336,
-        "y": 6409.746890068054,
-        "z": "34265cd.7205424",
+        "x": 2401.194549560547,
+        "y": 6506.746886253357,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "37375282.76ddb6",
+        "id": "67c04d7.9f55234",
         "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": 2438.194564819336,
-        "y": 6355.996887207031,
-        "z": "34265cd.7205424",
+        "x": 2401.194549560547,
+        "y": 6452.996883392334,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "bdc62da9.93398",
+        "id": "703340a7.64aea8",
         "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": 2784.4445838928223,
-        "y": 6198.496878623962,
-        "z": "34265cd.7205424",
+        "x": 2747.444568634033,
+        "y": 6295.496874809265,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c60c031b.634f38",
+        "id": "1eb209e1.85fe36",
         "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": 2785.6945877075195,
-        "y": 6140.996874809265,
-        "z": "34265cd.7205424",
+        "x": 2748.6945724487305,
+        "y": 6237.996870994568,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5573d94b.dc5",
+        "id": "5c926ac4.441d54",
         "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": 2441.944564819336,
-        "y": 6097.246870994568,
-        "z": "34265cd.7205424",
+        "x": 2404.944549560547,
+        "y": 6194.246867179871,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f4049c01.0aeaf",
+        "id": "ac68386.d27d148",
         "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": 2438.194564819336,
-        "y": 6029.746867179871,
-        "z": "34265cd.7205424",
+        "x": 2401.194549560547,
+        "y": 6126.746863365173,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "21dc9b2.c9b4164",
+        "id": "8ce17d26.7481f8",
         "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": 1935.6945304870605,
-        "y": 5954.746864318848,
-        "z": "34265cd.7205424",
+        "x": 1898.6945152282715,
+        "y": 6051.74686050415,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c98dc3b.19af54",
+        "id": "bcecc401.bf37b",
         "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": 1936.9445266723633,
-        "y": 5895.996856212616,
-        "z": "34265cd.7205424",
+        "x": 1899.9445114135742,
+        "y": 5992.996852397919,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "23db4204.137326",
+        "id": "9929cc19.031428",
         "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": 1088.749984741211,
-        "y": 4326.830564498901,
-        "z": "34265cd.7205424",
+        "x": 1051.7499694824219,
+        "y": 4423.830560684204,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c333832f.3cfc3",
+        "id": "da0980a4.747a78",
         "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": 1092.499984741211,
-        "y": 4403.080567359924,
-        "z": "34265cd.7205424",
+        "x": 1055.4999694824219,
+        "y": 4500.080563545227,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "9f112544.7f8a58",
+        "id": "ebdeb223.d9f918",
         "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": 476.07337188720703,
-        "y": 7964.7099623680115,
-        "z": "34265cd.7205424",
+        "x": 439.07335662841797,
+        "y": 8061.709958553314,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "84fdd3bf.927fd",
+        "id": "54266176.fdc52",
         "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": 573.4065093994141,
-        "y": 7823.908843040466,
-        "z": "34265cd.7205424",
+        "x": 536.406494140625,
+        "y": 7920.908839225769,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "48031f36.06a36",
-                "61c1ba7d.9ba324"
+                "1c4e5947.7ebd1f",
+                "8333ad7b.b22908"
             ]
         ]
     },
     {
-        "id": "48031f36.06a36",
+        "id": "1c4e5947.7ebd1f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 854.1906814575195,
-        "y": 7844.6049218177795,
-        "z": "34265cd.7205424",
+        "x": 817.1906661987305,
+        "y": 7941.604918003082,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b517797c.221e9"
+                "abc9858a.0d3df8"
             ]
         ]
     },
     {
-        "id": "61c1ba7d.9ba324",
+        "id": "8333ad7b.b22908",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 846.6193161010742,
-        "y": 7803.10494184494,
-        "z": "34265cd.7205424",
+        "x": 809.6193008422852,
+        "y": 7900.104938030243,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "b517797c.221e9"
+                "abc9858a.0d3df8"
             ]
         ]
     },
     {
-        "id": "b517797c.221e9",
+        "id": "abc9858a.0d3df8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1055.5494270324707,
-        "y": 7823.273902416229,
-        "z": "34265cd.7205424",
+        "x": 1018.5494117736816,
+        "y": 7920.273898601532,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "3d40ba87.1beba6",
-                "1a40ddac.06f67a"
+                "2a8c3363.38afe4",
+                "7d6098e9.a14988"
             ]
         ]
     },
     {
-        "id": "91e9c48a.4b386",
+        "id": "e61f24da.fdfe2",
         "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": 1809.799674987793,
-        "y": 7965.4422726631165,
-        "z": "34265cd.7205424",
+        "x": 1772.799659729004,
+        "y": 8062.442268848419,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a40ddac.06f67a",
+        "id": "7d6098e9.a14988",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1428.846923828125,
-        "y": 8017.465929508209,
-        "z": "34265cd.7205424",
+        "x": 1391.846908569336,
+        "y": 8114.465925693512,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             [
-                "91e9c48a.4b386",
-                "c1b9561e.c76ae8",
-                "c58f8414.25a99"
+                "e61f24da.fdfe2",
+                "24f79f9e.6a9758",
+                "77199d84.b65ee4"
             ]
         ]
     },
     {
-        "id": "3d40ba87.1beba6",
+        "id": "2a8c3363.38afe4",
         "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": 1260.0498428344727,
-        "y": 7795.798916339874,
-        "z": "34265cd.7205424",
+        "x": 1223.0498275756836,
+        "y": 7892.798912525177,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c0ccb17.3b1804",
+        "id": "23e90598.1ab01a",
         "type": "comment",
         "name": "This should have been removed from Dublin",
         "info": "",
         "comments": "",
-        "x": 728.7499923706055,
-        "y": 7285.302035331726,
-        "z": "34265cd.7205424",
+        "x": 691.7499771118164,
+        "y": 7382.302031517029,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "b13baffe.18c468",
+        "id": "bf8d316e.62c2d",
         "type": "set",
         "name": "Initialize SO 500 reponse params",
         "xml": "<set>\n<parameter name=\"so.ack-final-indicator\" value=\"Y\" />\n<parameter name=\"so.response-code\" value=\"500\" />\n<parameter name=\"so.notification-url\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"so.svc-request-id\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"so.service-type\" value=\"`$vf-module-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"so.service-instance-id\" value=\"`$vf-module-topology-operation-input.service-information.service-instance-id`\" />",
         "comments": "",
-        "x": 644.9999313354492,
-        "y": 270.02429485321045,
-        "z": "34265cd.7205424",
+        "x": 607.9999160766602,
+        "y": 367.0242910385132,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "78f1021d.4797bc",
+        "id": "50c201dc.9bc778",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2013.749870300293,
-        "y": 1172.3854970932007,
-        "z": "34265cd.7205424",
+        "x": 1976.749855041504,
+        "y": 1269.3854932785034,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "caca347e.8787d",
+        "id": "3728e3f3.742a9c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2021.2499160766602,
-        "y": 2124.6077165603638,
-        "z": "34265cd.7205424",
+        "x": 1984.249900817871,
+        "y": 2221.6077127456665,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "60730953.c387",
+        "id": "f83606b1.57aa68",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1309.9998931884766,
-        "y": 1120.3020401000977,
-        "z": "34265cd.7205424",
+        "x": 1272.9998779296875,
+        "y": 1217.3020362854004,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "57df4d97.1b3e74",
+        "id": "b7e13818.1bbbd",
         "type": "set",
         "name": "set so.reponse-code = 200",
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />\n",
         "comments": "",
-        "x": 1238.7499160766602,
-        "y": 1064.0520524978638,
-        "z": "34265cd.7205424",
+        "x": 1201.749900817871,
+        "y": 1161.0520486831665,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "9ea0a8d5.338e78",
+        "id": "d8f50cf3.b660b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2766.249897003174,
-        "y": 2684.330011367798,
-        "z": "34265cd.7205424",
+        "x": 2729.2498817443848,
+        "y": 2781.3300075531006,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a601dac.7a4482",
+        "id": "15beb6ed.58fac9",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4188.888832092285,
-        "y": 4559.885304450989,
-        "z": "34265cd.7205424",
+        "x": 4151.888816833496,
+        "y": 4656.8853006362915,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "28125649.296d72",
+        "id": "a33ba8b8.1d7cc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4371.388870239258,
-        "y": 5576.691199302673,
-        "z": "34265cd.7205424",
+        "x": 4334.388854980469,
+        "y": 5673.691195487976,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7108bf6.17f21",
+        "id": "e35102b5.ead4c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3672.638832092285,
-        "y": 5913.496632575989,
-        "z": "34265cd.7205424",
+        "x": 3635.638816833496,
+        "y": 6010.4966287612915,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d26e950.2b598",
+        "id": "ac95a18e.e9d4e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3792.638832092285,
-        "y": 7047.524464607239,
-        "z": "34265cd.7205424",
+        "x": 3755.638816833496,
+        "y": 7144.5244607925415,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1b9561e.c76ae8",
+        "id": "24f79f9e.6a9758",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1750.694320678711,
-        "y": 8018.21951341629,
-        "z": "34265cd.7205424",
+        "x": 1713.6943054199219,
+        "y": 8115.219509601593,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a1c5d05.89a983",
+        "id": "2f669bfa.b0d904",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_send-so-response",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 594.4444427490234,
-        "y": 8071.97101354599,
-        "z": "34265cd.7205424",
+        "x": 557.4444274902344,
+        "y": 8168.971009731293,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b817e7f.0206",
+        "id": "db29530f.c21f7",
         "type": "set",
         "name": "set so.reponse-code = 200",
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />\n",
         "comments": "",
-        "x": 524.4444427490234,
-        "y": 8017.942268848419,
-        "z": "34265cd.7205424",
+        "x": 487.4444274902344,
+        "y": 8114.942265033722,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "c58f8414.25a99",
+        "id": "77199d84.b65ee4",
         "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": 1631.9443817138672,
-        "y": 8066.969216823578,
-        "z": "34265cd.7205424",
+        "x": 1594.9443664550781,
+        "y": 8163.969213008881,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "a7b746c4.2d389",
+        "id": "23f95643.5a124a",
         "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": 3672.361000061035,
-        "y": 7096.135304450989,
-        "z": "34265cd.7205424",
+        "x": 3635.360984802246,
+        "y": 7193.1353006362915,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "eb62798f.37c47",
+        "id": "62bbfbdf.d34f3c",
         "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": 3551.111000061035,
-        "y": 5958.774464607239,
-        "z": "34265cd.7205424",
+        "x": 3514.110984802246,
+        "y": 6055.7744607925415,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "a39b4b61.59b038",
+        "id": "de495219.3e8f9",
         "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": 4254.861000061035,
-        "y": 5621.274464607239,
-        "z": "34265cd.7205424",
+        "x": 4217.860984802246,
+        "y": 5718.2744607925415,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "aee71bd7.cb4458",
+        "id": "98fe2567.5c7fd",
         "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": 4069.861000061035,
-        "y": 4604.052296638489,
-        "z": "34265cd.7205424",
+        "x": 4032.860984802246,
+        "y": 4701.0522928237915,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "bb2b8a64.4eda98",
+        "id": "7e407330.b6b2bc",
         "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": 2649.99991607666,
-        "y": 2730.4409685134888,
-        "z": "34265cd.7205424",
+        "x": 2612.999900817871,
+        "y": 2827.4409646987915,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "a38241eb.287ec8",
+        "id": "3312acbf.c98b04",
         "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": 1902.4999160766602,
-        "y": 2166.2742204666138,
-        "z": "34265cd.7205424",
+        "x": 1865.499900817871,
+        "y": 2263.2742166519165,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "d65a69c8.cf6ba",
+        "id": "adbc50ce.7d37f",
         "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": 1893.7499160766602,
-        "y": 1215.0243425369263,
-        "z": "34265cd.7205424",
+        "x": 1856.749900817871,
+        "y": 1312.024338722229,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "7e168e6e.8d02f8",
+        "id": "d6e0298e.3c1e8",
         "type": "set",
         "name": "copy vf-module data",
         "xml": "<set>\n<parameter name='vf-module-data.'\n  value='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.' />\n",
         "comments": "",
-        "x": 493.0711898803711,
-        "y": 7468.457430839539,
-        "z": "34265cd.7205424",
+        "x": 456.07117462158203,
+        "y": 7565.457427024841,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     },
     {
-        "id": "c1894905.cb3d58",
+        "id": "d3460755.d852e",
         "type": "execute",
         "name": "generate vf-module URL (sub service-instance-id)",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.vf-module`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.part\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.service-topology.service-topology-identifier.service-instance-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 592.1782302856445,
-        "y": 7552.745089530945,
-        "z": "34265cd.7205424",
+        "x": 555.1782150268555,
+        "y": 7649.745085716248,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7badb381.1fbf0c",
+        "id": "d35134f0.fec4d",
         "type": "execute",
         "name": "generate vf-module URL (sub vnf-id)",
         "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.part\"/>\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": 546.821044921875,
-        "y": 7597.923043251038,
-        "z": "34265cd.7205424",
+        "x": 509.82102966308594,
+        "y": 7694.92303943634,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d6c7dfc.640b9a",
+        "id": "7916d324.cb3bf4",
         "type": "execute",
         "name": "generate vf-module URL (sub vf-module-id)",
         "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.vf-module.url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 571.9997024536133,
-        "y": 7644.530034065247,
-        "z": "34265cd.7205424",
+        "x": 534.9996871948242,
+        "y": 7741.530030250549,
+        "z": "1e5d41b0.b1168e",
         "wires": [
             []
         ]
     },
     {
-        "id": "bcdb4bf7.c65098",
+        "id": "1d9375e8.fa4aba",
         "type": "comment",
         "name": "'New' version of DG, called for flows where SO expects async response (so-bpmn-infra)",
         "info": "",
         "comments": "",
-        "x": 528,
-        "y": 64,
-        "z": "34265cd.7205424",
+        "x": 490.99998474121094,
+        "y": 160.99999618530273,
+        "z": "1e5d41b0.b1168e",
+        "wires": []
+    },
+    {
+        "id": "54659cd5.5a9534",
+        "type": "switchNode",
+        "name": "cloud-owner passed in input?",
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 678,
+        "y": 320,
+        "z": "1e5d41b0.b1168e",
+        "wires": [
+            [
+                "47e0f28c.35157c"
+            ]
+        ]
+    },
+    {
+        "id": "47e0f28c.35157c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 975,
+        "y": 320,
+        "z": "1e5d41b0.b1168e",
+        "wires": [
+            [
+                "55504f2e.1c2d8"
+            ]
+        ]
+    },
+    {
+        "id": "55504f2e.1c2d8",
+        "type": "set",
+        "name": "set prop.cloud-region.cloud-owner to input 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": 1346,
+        "y": 316,
+        "z": "1e5d41b0.b1168e",
         "wires": []
     }
 ]
\ No newline at end of file